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 b31c8e57a..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
@@ -68,9 +68,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, ItemStack itemstack, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, itemstack, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
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 e4d0f7ce6..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
@@ -67,7 +67,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -121,8 +121,9 @@ public class BatController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BatNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 ce6bc9b61..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
@@ -64,7 +64,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -118,8 +118,9 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new BlazeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 9b9be233b..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
@@ -73,7 +73,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -143,8 +143,9 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -175,11 +176,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 71bdba69d..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
@@ -82,7 +82,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -152,8 +152,9 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -184,11 +185,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 b77fca35e..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
@@ -86,7 +86,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -95,9 +95,8 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand, itemstack);
             if (itemstack != null && itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild
-                    && !this.isBaby()) {
+                    && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman, enumhand, itemstack);
         }
 
@@ -167,8 +166,9 @@ public class CowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -199,11 +199,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 aead8c774..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
@@ -79,7 +79,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -113,8 +113,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -160,8 +161,9 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -192,11 +194,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 20d6f6d6e..1af763b93 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
@@ -70,7 +70,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -99,8 +99,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -138,8 +139,9 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 b590932c5..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
@@ -73,7 +73,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,8 +102,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -159,9 +161,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean k(double d1, double d2, double d3) {
-            if (npc == null) {
+            if (npc == null)
                 return super.k(d1, d2, d3);
-            }
             return false;
         }
 
@@ -182,11 +183,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 9ccbd84d0..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
@@ -73,7 +73,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,8 +102,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,17 +169,17 @@ public class EndermiteController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 6be601b26..ab98f9f4d 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
@@ -95,9 +95,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && !isTracked) {
+        if (npc != null && !isTracked)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -137,12 +136,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -151,16 +145,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                world.removeEntity(EntityHumanNPC.this);
-            }
-        }, 15); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> world.removeEntity(EntityHumanNPC.this), 15); // give enough time for death and smoke animation
     }
 
     @Override
@@ -228,9 +216,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -318,11 +305,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean m_() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.m_();
-        } else {
+        else
             return false;
-        }
     }
 
     private void moveOnCurrentHeading() {
@@ -399,7 +385,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
                 if (cache != null) {
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 2c750fba2..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
@@ -50,7 +50,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,8 +109,9 @@ public class GhastController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GhastNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 1e6ba251a..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
@@ -59,7 +59,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class GiantController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 81a0ef217..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
@@ -59,7 +59,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -129,8 +129,9 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -162,11 +163,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 9a4e6dd57..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
@@ -50,6 +50,7 @@ public class HorseController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,8 +165,9 @@ public class HorseController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -211,11 +213,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         private static MethodHandle C = NMS.getMethodHandle(EntityHorse.class, "c", true, int.class, boolean.class);
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 0925fe2a5..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_10_R1.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 c3c6542d1..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
@@ -59,7 +59,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 5809eb3b5..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
@@ -65,7 +65,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,8 +94,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -141,8 +142,9 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -173,11 +175,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 1df7f2e4e..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
@@ -75,7 +75,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_10_R1.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 c4bed18c4..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
@@ -71,7 +71,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,8 +107,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -147,8 +148,9 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -172,17 +174,17 @@ public class MushroomCowController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 768bbd531..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
@@ -68,7 +68,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,8 +97,9 @@ public class OcelotController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -144,8 +145,9 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -169,17 +171,17 @@ public class OcelotController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 26d4e2dab..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
@@ -69,7 +69,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -105,9 +105,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean cP() {
-            if (npc == null) {
+            if (npc == null)
                 return super.cP();
-            }
             return false;
         }
 
@@ -147,8 +146,9 @@ public class PigController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -179,11 +179,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 6d2ab631e..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
@@ -59,7 +59,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class PigZombieController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 0eb76462e..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
@@ -59,7 +59,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -113,8 +113,9 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PolarBearNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 23f8c4d69..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
@@ -69,7 +69,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -139,8 +139,9 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -179,11 +180,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 239432a40..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
@@ -68,7 +68,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,8 +97,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -137,8 +138,9 @@ public class SheepController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -162,17 +164,17 @@ public class SheepController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 d4ec805c1..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
@@ -60,7 +60,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -129,8 +130,9 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -162,11 +164,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 97298d6df..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
@@ -59,7 +59,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class SilverfishController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 345c5caef..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
@@ -59,7 +59,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8b6b2e358..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
@@ -65,7 +65,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -142,8 +142,9 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -174,11 +175,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 1d83741a1..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
@@ -59,7 +59,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 61f3616ae..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
@@ -59,7 +59,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class SpiderController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 18449889b..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
@@ -59,7 +59,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SquidController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -152,11 +154,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 4d7da6822..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
@@ -74,7 +74,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,8 +161,9 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -193,11 +194,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 b8cd87911..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
@@ -59,7 +59,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class WitchController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class WitchController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8f085dd7a..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
@@ -50,7 +50,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -79,8 +79,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -109,8 +110,9 @@ public class WitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 78fb2574b..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
@@ -70,7 +70,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -140,8 +140,9 @@ public class WolfController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -172,11 +173,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 d1c8681a0..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
@@ -59,7 +59,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 8a303ef2c..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.getBlock().b(block, null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
@@ -66,7 +66,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
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 a7f25b574..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
@@ -391,9 +391,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().ay();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -431,9 +430,8 @@ public class NMSImpl implements NMSBridge {
             }
         } catch (Exception e) {
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
@@ -464,9 +462,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.a()) {
+        if (controller == null || !controller.a())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -477,9 +474,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aQ;
     }
 
@@ -540,7 +536,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -588,8 +584,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -613,12 +609,8 @@ public class NMSImpl implements NMSBridge {
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -696,11 +688,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -832,7 +823,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -842,8 +833,9 @@ public class NMSImpl implements NMSBridge {
             double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff);
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY)) - 90;
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -874,7 +866,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -921,8 +913,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(new Location(player.getWorld(), 0, 0, 0),
@@ -933,8 +923,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.windowId = handle.nextContainerCounter();
@@ -972,12 +962,11 @@ public class NMSImpl implements NMSBridge {
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.k_();
-            if (!removeFromPlayerList) {
+            if (!removeFromPlayerList)
                 return;
-            }
             Entity entity1 = entity.bB();
             if (entity1 != null) {
-                if ((entity1.dead) || (!entity1.w(entity))) {
+                if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
             } else {
@@ -1010,8 +999,9 @@ public class NMSImpl implements NMSBridge {
             return;
         Class<?> search = clazz;
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
-            if (!ENTITY_CLASS_TO_INT.containsKey(search))
+            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));
@@ -1210,8 +1200,9 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = (EntityLiving) getHandle(entity);
         yaw = Util.clamp(yaw);
         handle.aP = yaw;
-        if (!(handle instanceof EntityHuman))
+        if (!(handle instanceof EntityHuman)) {
             handle.aO = yaw;
+        }
         handle.aQ = yaw;
     }
 
@@ -1340,8 +1331,8 @@ public class NMSImpl implements NMSBridge {
         EntityPlayer from = (EntityPlayer) getHandle(entity);
         PerPlayerMetadata<Long> meta = CitizensAPI.getLocationLookup().registerMetadata("sleeping", null);
         if (sleep) {
-            List<Player> nearbyPlayers = Lists.newArrayList(Iterables
-                    .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> {
+            List<Player> nearbyPlayers = Lists.newArrayList(
+                    Iterables.filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), p -> {
                         Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString());
                         if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000)
                             return true;
@@ -1380,7 +1371,7 @@ public class NMSImpl implements NMSBridge {
             list.add(new PacketPlayOutEntityTeleport(from));
             for (Player nearby : nearbyPlayers) {
                 nearby.sendBlockChange(bedLoc, Material.BED_BLOCK, facingByte);
-                list.forEach((packet) -> sendPacket(nearby, packet));
+                list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
         } else {
@@ -1509,9 +1500,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1584,9 +1574,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_10_R1.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1595,25 +1584,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_10_R1.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_10_R1.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_10_R1.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_10_R1.NBTTagInt) base).e());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_10_R1.NBTTagFloat) base).i());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_10_R1.NBTTagDouble) base).h());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_10_R1.NBTTagLong) base).d());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_10_R1.NBTTagShort) base).f());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_10_R1.NBTTagByte) base).g());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_10_R1.NBTTagByteArray) base).c());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_10_R1.NBTTagIntArray) base).d());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagString)
             return new StringTag(key, base.toString());
-        } else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_10_R1.NBTTagList) {
             List<net.minecraft.server.v1_10_R1.NBTBase> list = (List<net.minecraft.server.v1_10_R1.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1623,19 +1612,17 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(EntityLiving entity, float f, float f1) {
-        if ((entity.ct()) || (entity.bA())) {
-            if ((entity.isInWater())
-                    && ((!(entity instanceof EntityHuman)) || (!((EntityHuman) entity).abilities.isFlying))) {
+        if (entity.ct() || entity.bA()) {
+            if (entity.isInWater()
+                    && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d1 = entity.locY;
                 float f4 = entity instanceof EntityPolarBear ? 0.98F : 0.8F;
                 float f3 = 0.02F;
@@ -1658,12 +1645,12 @@ 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))) {
+                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))) {
+            } else if (entity.ao()
+                    && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d1 = entity.locY;
                 entity.a(f, f1, 0.02F);
                 entity.move(entity.motX, entity.motY, entity.motZ);
@@ -1673,8 +1660,8 @@ 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))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d1, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
             } else if (entity.cG()) {
@@ -1689,7 +1676,7 @@ public class NMSImpl implements NMSBridge {
                 float f6 = MathHelper.cos(f5);
                 f6 = (float) (f6 * f6 * Math.min(1.0D, d3 / 0.4D));
                 entity.motY += -0.08D + f6 * 0.06D;
-                if ((entity.motY < 0.0D) && (d0 > 0.0D)) {
+                if (entity.motY < 0.0D && d0 > 0.0D) {
                     double d4 = entity.motY * -0.1D * f6;
                     entity.motY += d4;
                     entity.motX += vec3d.x * d4 / d0;
@@ -1709,7 +1696,7 @@ public class NMSImpl implements NMSBridge {
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
                 entity.move(entity.motX, entity.motY, entity.motZ);
-                if ((entity.positionChanged) && (!entity.world.isClientSide)) {
+                if (entity.positionChanged && !entity.world.isClientSide) {
                     double d4 = Math.sqrt(entity.motX * entity.motX + entity.motZ * entity.motZ);
                     double d5 = d2 - d4;
                     float f7 = (float) (d5 * 10.0D - 3.0D);
@@ -1718,8 +1705,8 @@ public class NMSImpl implements NMSBridge {
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f7);
                     }
                 }
-                if ((entity.onGround) && (!entity.world.isClientSide) && (entity.getFlag(7))
-                        && (!CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())) {
+                if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
             } else {
@@ -1749,13 +1736,13 @@ 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)) {
+                    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_())) {
+                if (entity.positionChanged && entity.m_()) {
                     entity.motY = 0.2D;
                 }
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -1763,8 +1750,8 @@ public class NMSImpl implements NMSBridge {
                             * 0.2D;
                 } else {
                     blockposition_pooledblockposition.e(entity.locX, 0.0D, entity.locZ);
-                    if ((entity.world.isClientSide) && ((!entity.world.isLoaded(blockposition_pooledblockposition))
-                            || (!entity.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p()))) {
+                    if (entity.world.isClientSide && (!entity.world.isLoaded(blockposition_pooledblockposition)
+                            || !entity.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p())) {
                         if (entity.locY > 0.0D) {
                             entity.motY = -0.1D;
                         } else {
@@ -1874,7 +1861,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -1883,8 +1870,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
@@ -1906,15 +1893,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
-        if ((f != entity.width) || (f1 != entity.length)) {
+        if (f != entity.width || f1 != entity.length) {
             float f2 = entity.width;
             entity.width = f;
             entity.length = f1;
             entity.a(new AxisAlignedBB(entity.getBoundingBox().a, entity.getBoundingBox().b, entity.getBoundingBox().c,
                     entity.getBoundingBox().a + entity.width, entity.getBoundingBox().b + entity.length,
                     entity.getBoundingBox().c + entity.width));
-            if ((entity.width > f2) && (!justCreated) && (!entity.world.isClientSide))
+            if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move((f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
+            }
         }
     }
 
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 79c654adb..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
@@ -54,9 +54,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
@@ -90,7 +90,7 @@ public class PlayerControllerMove extends ControllerMove {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;
                 ((EntityInsentient) this.a).getControllerJump().a();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 if (this.a instanceof EntityHumanNPC) {
                     ((EntityHumanNPC) this.a).getControllerJump().a();
                 } else {
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 7e1847983..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
@@ -61,23 +61,21 @@ public class PlayerNavigation extends NavigationAbstract {
         BlockPosition localBlockPosition;
         if (this.b.getType(paramBlockPosition).getMaterial() == Material.AIR) {
             localBlockPosition = paramBlockPosition.down();
-            while ((localBlockPosition.getY() > 0)
-                    && (this.b.getType(localBlockPosition).getMaterial() == Material.AIR)) {
+            while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.down();
             }
-            if (localBlockPosition.getY() > 0) {
+            if (localBlockPosition.getY() > 0)
                 return supera(localBlockPosition.up());
-            }
-            while ((localBlockPosition.getY() < this.b.getHeight())
-                    && (this.b.getType(localBlockPosition).getMaterial() == Material.AIR)) {
+            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())) {
+            while (localBlockPosition.getY() < this.b.getHeight()
+                    && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
             return a2(localBlockPosition);
@@ -110,9 +108,8 @@ public class PlayerNavigation extends NavigationAbstract {
     @Override
     public boolean a(Entity paramEntity, double paramDouble) {
         PathEntity localPathEntity = a(paramEntity);
-        if (localPathEntity != null) {
+        if (localPathEntity != null)
             return a(localPathEntity, paramDouble);
-        }
         return false;
     }
 
@@ -120,9 +117,8 @@ public class PlayerNavigation extends NavigationAbstract {
             Vec3D paramVec3D, double paramDouble1, double paramDouble2) {
         int i = paramInt1 - paramInt4 / 2;
         int j = paramInt3 - paramInt6 / 2;
-        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2)) {
+        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2))
             return false;
-        }
         for (int k = i; k < i + paramInt4; k++) {
             for (int m = j; m < j + paramInt6; m++) {
                 double d1 = k + 0.5D - paramVec3D.x;
@@ -130,20 +126,17 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                     PathType localPathType = this.e.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5,
                             paramInt6, true, true);
-                    if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA)
-                            || (localPathType == PathType.OPEN)) {
+                    if (localPathType == PathType.WATER || localPathType == PathType.LAVA
+                            || localPathType == PathType.OPEN)
                         return false;
-                    }
                     localPathType = this.e.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true,
                             true);
                     float f1 = this.a.a(localPathType);
-                    if ((f1 < 0.0F) || (f1 >= 8.0F)) {
+                    if (f1 < 0.0F || f1 >= 8.0F)
                         return false;
-                    }
-                    if ((localPathType == PathType.DAMAGE_FIRE) || (localPathType == PathType.DANGER_FIRE)
-                            || (localPathType == PathType.DAMAGE_OTHER)) {
+                    if (localPathType == PathType.DAMAGE_FIRE || localPathType == PathType.DANGER_FIRE
+                            || localPathType == PathType.DAMAGE_OTHER)
                         return false;
-                    }
                 }
             }
         }
@@ -160,9 +153,8 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = paramPathEntity;
         }
         d();
-        if (this.c.d() == 0) {
+        if (this.c.d() == 0)
             return false;
-        }
         this.d = paramDouble;
         Vec3D localVec3D = c();
         this.i = this.h;
@@ -179,16 +171,16 @@ public class PlayerNavigation extends NavigationAbstract {
             this.i = this.h;
             this.j = paramVec3D;
         }
-        if ((this.c != null) && (!this.c.b())) {
+        if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (!localVec3D.equals(this.k)) {
                 this.k = localVec3D;
                 double d1 = paramVec3D.f(this.k);
-                this.n = (this.a.cp() > 0.0F ? d1 / this.a.cp() * 1000.0D : 0.0D);
+                this.n = this.a.cp() > 0.0F ? d1 / this.a.cp() * 1000.0D : 0.0D;
             } else {
                 this.l += System.currentTimeMillis() - this.m;
             }
-            if ((this.n > 0.0D) && (this.l > this.n * 3.0D)) {
+            if (this.n > 0.0D && this.l > this.n * 3.0D) {
                 this.k = Vec3D.a;
                 this.l = 0L;
                 this.n = 0.0D;
@@ -205,17 +197,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double d1 = paramVec3D2.x - paramVec3D1.x;
         double d2 = paramVec3D2.z - paramVec3D1.z;
         double d3 = d1 * d1 + d2 * d2;
-        if (d3 < 1.0E-8D) {
+        if (d3 < 1.0E-8D)
             return false;
-        }
         double d4 = 1.0D / Math.sqrt(d3);
         d1 *= d4;
         d2 *= d4;
         paramInt1 += 2;
         paramInt3 += 2;
-        if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+        if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
             return false;
-        }
         paramInt1 -= 2;
         paramInt3 -= 2;
         double d5 = 1.0D / Math.abs(d1);
@@ -236,7 +226,7 @@ public class PlayerNavigation extends NavigationAbstract {
         int i1 = MathHelper.floor(paramVec3D2.z);
         int i2 = n - i;
         int i3 = i1 - j;
-        while ((i2 * k > 0) || (i3 * m > 0)) {
+        while (i2 * k > 0 || i3 * m > 0) {
             if (d7 < d8) {
                 d7 += d5;
                 i += k;
@@ -246,20 +236,17 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-            if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+            if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
-            }
         }
         return true;
     }
 
     public PathEntity a2(BlockPosition paramBlockPosition) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
-        if ((this.c != null) && (!this.c.b()) && (paramBlockPosition.equals(this.r))) {
+        if (this.c != null && !this.c.b() && paramBlockPosition.equals(this.r))
             return this.c;
-        }
         this.r = paramBlockPosition;
         float f1 = h();
         this.b.methodProfiler.a("pathfind");
@@ -274,7 +261,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean b() {
-        return (this.a.onGround) || ((g()) && (p())) || (this.a.isPassenger());
+        return this.a.onGround || g() && p() || this.a.isPassenger();
     }
 
     @Override
@@ -294,9 +281,8 @@ public class PlayerNavigation extends NavigationAbstract {
             double d2 = localBlockPosition.getZ() + 0.5D - paramVec3D.z;
             if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                 Block localBlock = this.b.getType(localBlockPosition).getBlock();
-                if (!localBlock.b(this.b, localBlockPosition)) {
+                if (!localBlock.b(this.b, localBlockPosition))
                     return false;
-                }
             }
         }
         return true;
@@ -323,7 +309,7 @@ public class PlayerNavigation extends NavigationAbstract {
             Block localBlock = localIBlockData.getBlock();
             if (localBlock == Blocks.cauldron) {
                 this.c.a(i, localPathPoint.a(localPathPoint.a, localPathPoint.b + 1, localPathPoint.c));
-                if ((localObject != null) && (localPathPoint.b >= ((PathPoint) localObject).b)) {
+                if (localObject != null && localPathPoint.b >= ((PathPoint) localObject).b) {
                     this.c.a(i + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1,
                             ((PathPoint) localObject).c));
                 }
@@ -331,9 +317,8 @@ public class PlayerNavigation extends NavigationAbstract {
         }
         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)))) {
+                    MathHelper.floor(this.a.locZ))))
                 return;
-            }
             for (i = 0; i < this.c.d(); i++) {
                 localPathPoint = this.c.a(i);
                 if (this.b.h(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c))) {
@@ -387,27 +372,24 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.p) {
             j();
         }
-        if (n()) {
+        if (n())
             return;
-        }
         if (b()) {
             m();
-        } else if ((this.c != null) && (this.c.e() < this.c.d())) {
+        } else if (this.c != null && this.c.e() < this.c.d()) {
             Vec3D localVec3D = c();
             Vec3D localObject = this.c.a(this.a, this.c.e());
-            if ((localVec3D.y > localObject.y) && (!this.a.onGround)
-                    && (MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x))
-                    && (MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z))) {
+            if (localVec3D.y > localObject.y && !this.a.onGround
+                    && MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x)
+                    && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
         }
-        if (n()) {
+        if (n())
             return;
-        }
         Vec3D localVec3D = this.c.a(this.a);
-        if (localVec3D == null) {
+        if (localVec3D == null)
             return;
-        }
         Object localObject = new BlockPosition(localVec3D).down();
         AxisAlignedBB localAxisAlignedBB = this.b.getType((BlockPosition) localObject).c(this.b,
                 (BlockPosition) localObject);
@@ -425,10 +407,10 @@ public class PlayerNavigation extends NavigationAbstract {
                 break;
             }
         }
-        this.o = (this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F);
+        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)) {
+        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);
@@ -445,7 +427,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public boolean n() {
-        return (this.c == null) || (this.c.b());
+        return this.c == null || this.c.b();
     }
 
     @Override
@@ -455,26 +437,24 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean p() {
-        return (this.a.isInWater()) || (this.a.ao());
+        return this.a.isInWater() || this.a.ao();
     }
 
     private int r() {
-        if ((!this.a.isInWater()) || (!g())) {
+        if (!this.a.isInWater() || !g())
             return (int) (this.a.getBoundingBox().b + 0.5D);
-        }
         int i = (int) this.a.getBoundingBox().b;
         Block localBlock = this.b
                 .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ))).getBlock();
         int j = 0;
-        while ((localBlock == Blocks.FLOWING_WATER) || (localBlock == Blocks.WATER)) {
+        while (localBlock == Blocks.FLOWING_WATER || localBlock == Blocks.WATER) {
             i++;
             localBlock = this.b
                     .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ)))
                     .getBlock();
             j++;
-            if (j > 16) {
+            if (j > 16)
                 return (int) this.a.getBoundingBox().b;
-            }
         }
         return i;
     }
@@ -484,12 +464,10 @@ public class PlayerNavigation extends NavigationAbstract {
     }
 
     public PathEntity supera(BlockPosition paramBlockPosition) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
-        if ((this.c != null) && (!this.c.b()) && (paramBlockPosition.equals(this.r))) {
+        if (this.c != null && !this.c.b() && paramBlockPosition.equals(this.r))
             return this.c;
-        }
         this.r = paramBlockPosition;
         float f1 = h();
         BlockPosition localBlockPosition = new BlockPosition(this.a);
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 eea66ab84..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
@@ -13,7 +13,7 @@ import net.minecraft.server.v1_10_R1.PathPoint;
 
 public class PlayerPathfinder {
     private final Path a = new Path();
-    private final Set<PathPoint> b = new HashSet<PathPoint>();
+    private final Set<PathPoint> b = new HashSet<>();
     private final PathPoint[] c = new PathPoint[32];
     private final PlayerPathfinderNormal d;
 
@@ -53,10 +53,10 @@ public class PlayerPathfinder {
         }
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
-        arrayOfPathPoint[(--i)] = localPathPoint;
+        arrayOfPathPoint[--i] = localPathPoint;
         while (localPathPoint.h != null) {
             localPathPoint = localPathPoint.h;
-            arrayOfPathPoint[(--i)] = localPathPoint;
+            arrayOfPathPoint[--i] = localPathPoint;
         }
         return new PathEntity(arrayOfPathPoint);
     }
@@ -88,25 +88,24 @@ public class PlayerPathfinder {
             for (int k = 0; k < j; k++) {
                 PathPoint localPathPoint = this.c[k];
                 float f1 = localObject2.c(localPathPoint);
-                localPathPoint.j = (localObject2.j + f1);
-                localPathPoint.k = (f1 + localPathPoint.l);
+                localPathPoint.j = localObject2.j + f1;
+                localPathPoint.k = f1 + localPathPoint.l;
                 float f2 = localObject2.e + localPathPoint.k;
-                if ((localPathPoint.j < paramFloat) && ((!localPathPoint.a()) || (f2 < localPathPoint.e))) {
-                    localPathPoint.h = (localObject2);
+                if (localPathPoint.j < paramFloat && (!localPathPoint.a() || f2 < localPathPoint.e)) {
+                    localPathPoint.h = localObject2;
                     localPathPoint.e = f2;
-                    localPathPoint.f = (localPathPoint.c(paramPathPoint2) + localPathPoint.l);
+                    localPathPoint.f = localPathPoint.c(paramPathPoint2) + localPathPoint.l;
                     if (localPathPoint.a()) {
                         this.a.a(localPathPoint, localPathPoint.e + localPathPoint.f);
                     } else {
-                        localPathPoint.g = (localPathPoint.e + localPathPoint.f);
+                        localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
                 }
             }
         }
-        if (localObject1 == paramPathPoint1) {
+        if (localObject1 == paramPathPoint1)
             return null;
-        }
         Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1);
         return (PathEntity) localObject2;
     }
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 6750d3081..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
@@ -56,19 +56,19 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     @Override
     public PathType a(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) {
         PathType localPathType1 = getPathTypeBase(paramIBlockAccess, paramInt1, paramInt2, paramInt3);
-        if ((localPathType1 == PathType.OPEN) && (paramInt2 >= 1)) {
+        if (localPathType1 == PathType.OPEN && paramInt2 >= 1) {
             PathType localPathType2 = localPathType1;
-            while (localPathType2 == PathType.OPEN && (--paramInt2 >= 1)) {
+            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
+            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++) {
-                    if ((i != paramInt1) || (k != paramInt3)) {
+                    if (i != paramInt1 || k != paramInt3) {
                         Block localBlock2 = paramIBlockAccess.getType(new BlockPosition(i, paramInt2, k)).getBlock();
                         if (localBlock2 == Blocks.CACTUS) {
                             localPathType1 = PathType.DANGER_CACTUS;
@@ -94,23 +94,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             for (int k = paramInt2; k < paramInt2 + paramInt5; k++) {
                 for (int m = paramInt3; m < paramInt3 + paramInt6; m++) {
                     PathType localPathType2 = a(paramIBlockAccess, i, k, m);
-                    if ((localPathType2 == PathType.DOOR_WOOD_CLOSED) && (paramBoolean1) && (paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-                    if ((localPathType2 == PathType.DOOR_OPEN) && (!paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-                    if ((localPathType2 == PathType.RAIL)
-                            && (!(paramIBlockAccess.getType(localBlockPosition)
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))
-                            && (!(paramIBlockAccess.getType(localBlockPosition.down())
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))) {
+                    if (localPathType2 == PathType.RAIL
+                            && !(paramIBlockAccess.getType(localBlockPosition)
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)
+                            && !(paramIBlockAccess.getType(localBlockPosition.down())
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-                    if ((i == paramInt1) && (k == paramInt2) && (m == paramInt3)) {
+                    if (i == paramInt1 && k == paramInt2 && m == paramInt3) {
                         localObject1 = localPathType2;
                     }
-                    if ((k > paramInt2) && (localPathType2 != PathType.OPEN)) {
+                    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)) {
@@ -121,21 +121,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 }
             }
         }
-        if (localEnumSet.contains(PathType.FENCE)) {
+        if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
-        }
         Object localObject2 = PathType.BLOCKED;
         for (PathType localPathType1 : localEnumSet) {
-            if (paramEntityInsentient.a(localPathType1) < 0.0F) {
+            if (paramEntityInsentient.a(localPathType1) < 0.0F)
                 return localPathType1;
-            }
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a((PathType) localObject2)) {
                 localObject2 = localPathType1;
             }
         }
-        if ((localObject1 == PathType.OPEN) && (paramEntityInsentient.a((PathType) localObject2) == 0.0F)) {
+        if (localObject1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject2) == 0.0F)
             return PathType.OPEN;
-        }
         return (PathType) localObject2;
     }
 
@@ -151,23 +148,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             for (int k = paramInt2; k < paramInt2 + paramInt5; k++) {
                 for (int m = paramInt3; m < paramInt3 + paramInt6; m++) {
                     PathType localPathType2 = a(paramIBlockAccess, i, k, m);
-                    if ((localPathType2 == PathType.DOOR_WOOD_CLOSED) && (paramBoolean1) && (paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-                    if ((localPathType2 == PathType.DOOR_OPEN) && (!paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-                    if ((localPathType2 == PathType.RAIL)
-                            && (!(paramIBlockAccess.getType(localBlockPosition)
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))
-                            && (!(paramIBlockAccess.getType(localBlockPosition.down())
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))) {
+                    if (localPathType2 == PathType.RAIL
+                            && !(paramIBlockAccess.getType(localBlockPosition)
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)
+                            && !(paramIBlockAccess.getType(localBlockPosition.down())
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-                    if ((i == paramInt1) && (k == paramInt2) && (m == paramInt3)) {
+                    if (i == paramInt1 && k == paramInt2 && m == paramInt3) {
                         localObject1 = localPathType2;
                     }
-                    if ((k > paramInt2) && (localPathType2 != PathType.OPEN)) {
+                    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)) {
@@ -178,21 +175,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 }
             }
         }
-        if (localEnumSet.contains(PathType.FENCE)) {
+        if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
-        }
         Object localObject2 = PathType.BLOCKED;
         for (PathType localPathType1 : localEnumSet) {
-            if (paramEntityInsentient.a(localPathType1) < 0.0F) {
+            if (paramEntityInsentient.a(localPathType1) < 0.0F)
                 return localPathType1;
-            }
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a((PathType) localObject2)) {
                 localObject2 = localPathType1;
             }
         }
-        if ((localObject1 == PathType.OPEN) && (paramEntityInsentient.a((PathType) localObject2) == 0.0F)) {
+        if (localObject1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject2) == 0.0F)
             return PathType.OPEN;
-        }
         return (PathType) localObject2;
     }
 
@@ -202,9 +196,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         BlockPosition localBlockPosition1 = new BlockPosition(paramInt1, paramInt2, paramInt3);
         BlockPosition localBlockPosition2 = localBlockPosition1.down();
         double d1 = paramInt2 - (1.0D - this.a.getType(localBlockPosition2).c(this.a, localBlockPosition2).e);
-        if (d1 - paramDouble > 1.0D) {
+        if (d1 - paramDouble > 1.0D)
             return null;
-        }
         PathType localPathType = a(this.b, paramInt1, paramInt2, paramInt3);
         float f = this.b.a(localPathType);
         double d2 = this.b.width / 2.0D;
@@ -213,14 +206,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localPathPoint.m = localPathType;
             localPathPoint.l = Math.max(localPathPoint.l, f);
         }
-        if (localPathType == PathType.WALKABLE) {
+        if (localPathType == PathType.WALKABLE)
             return localPathPoint;
-        }
-        if ((localPathPoint == null) && (paramInt4 > 0) && (localPathType != PathType.FENCE)
-                && (localPathType != PathType.TRAPDOOR)) {
+        if (localPathPoint == null && paramInt4 > 0 && localPathType != PathType.FENCE
+                && localPathType != PathType.TRAPDOOR) {
             localPathPoint = a(paramInt1, paramInt2 + 1, paramInt3, paramInt4 - 1, paramDouble, paramEnumDirection);
-            if ((localPathPoint != null)
-                    && ((localPathPoint.m == PathType.OPEN) || (localPathPoint.m == PathType.WALKABLE))) {
+            if (localPathPoint != null
+                    && (localPathPoint.m == PathType.OPEN || localPathPoint.m == PathType.WALKABLE)) {
                 double d3 = paramInt1 - paramEnumDirection.getAdjacentX() + 0.5D;
                 double d4 = paramInt3 - paramEnumDirection.getAdjacentZ() + 0.5D;
                 AxisAlignedBB localAxisAlignedBB1 = new AxisAlignedBB(d3 - d2, paramInt2 + 0.001D, d4 - d2, d3 + d2,
@@ -235,24 +227,21 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         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);
-            if (this.b.world.b(localAxisAlignedBB4)) {
+            if (this.b.world.b(localAxisAlignedBB4))
                 return null;
-            }
             int i = 0;
-            while ((paramInt2 > 0) && (localPathType == PathType.OPEN)) {
+            while (paramInt2 > 0 && localPathType == PathType.OPEN) {
                 paramInt2--;
-                if (i++ >= b.aY()) {
+                if (i++ >= b.aY())
                     return null;
-                }
                 localPathType = a(this.b, paramInt1, paramInt2, paramInt3);
                 f = this.b.a(localPathType);
-                if ((localPathType != PathType.OPEN) && (f >= 0.0F)) {
+                if (localPathType != PathType.OPEN && f >= 0.0F) {
                     localPathPoint = a(paramInt1, paramInt2, paramInt3);
                     localPathPoint.m = localPathType;
                     localPathPoint.l = Math.max(localPathPoint.l, f);
-                } else if (f < 0.0F) {
+                } else if (f < 0.0F)
                     return null;
-                }
             }
         }
         return localPathPoint;
@@ -278,57 +267,49 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 EnumDirection.EAST);
         PathPoint localPathPoint4 = a(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
                 EnumDirection.NORTH);
-        if ((localPathPoint1 != null) && (!localPathPoint1.i) && (localPathPoint1.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint1;
+        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 (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[i++] = localPathPoint2;
         }
-        if ((localPathPoint3 != null) && (!localPathPoint3.i) && (localPathPoint3.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint3;
+        if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[i++] = localPathPoint3;
         }
-        if ((localPathPoint4 != null) && (!localPathPoint4.i) && (localPathPoint4.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint4;
+        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;
-        int i2 = (localPathPoint2 == null) || (localPathPoint2.m == PathType.OPEN) || (localPathPoint2.l != 0.0F) ? 1
-                : 0;
+        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;
+        int i2 = localPathPoint2 == null || localPathPoint2.m == PathType.OPEN || localPathPoint2.l != 0.0F ? 1 : 0;
         PathPoint localPathPoint5;
-        if ((m != 0) && (i2 != 0)) {
+        if (m != 0 && i2 != 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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((m != 0) && (i1 != 0)) {
+        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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((n != 0) && (i2 != 0)) {
+        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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((n != 0) && (i1 != 0)) {
+        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;
+            if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
         return i;
@@ -338,12 +319,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     public PathPoint b() {
         int i;
         BlockPosition localObject1;
-        if ((e()) && (this.b.isInWater())) {
+        if (e() && this.b.isInWater()) {
             i = (int) this.b.getBoundingBox().b;
             localObject1 = new BlockPosition.MutableBlockPosition(MathHelper.floor(this.b.locX), i,
                     MathHelper.floor(this.b.locZ));
             Block localObject2 = this.a.getType(localObject1).getBlock();
-            while ((localObject2 == Blocks.FLOWING_WATER) || (localObject2 == Blocks.WATER)) {
+            while (localObject2 == Blocks.FLOWING_WATER || localObject2 == Blocks.WATER) {
                 i++;
                 ((MutableBlockPosition) localObject1).c(MathHelper.floor(this.b.locX), i,
                         MathHelper.floor(this.b.locZ));
@@ -351,9 +332,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             }
         } 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)) {
+            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();
@@ -363,16 +343,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         localObject1 = new BlockPosition(this.b);
         Object localObject2 = a(this.b, localObject1.getX(), i, localObject1.getZ());
         if (this.b.a((PathType) localObject2) < 0.0F) {
-            HashSet<BlockPosition> localHashSet = new HashSet<BlockPosition>();
+            HashSet<BlockPosition> localHashSet = new HashSet<>();
             localHashSet.add(new BlockPosition(this.b.getBoundingBox().a, i, this.b.getBoundingBox().c));
             localHashSet.add(new BlockPosition(this.b.getBoundingBox().a, i, this.b.getBoundingBox().f));
             localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().c));
             localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().f));
             for (BlockPosition localBlockPosition : localHashSet) {
                 PathType localPathType = a(this.b, localBlockPosition);
-                if (this.b.a(localPathType) >= 0.0F) {
+                if (this.b.a(localPathType) >= 0.0F)
                     return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
-                }
             }
         }
         return a(localObject1.getX(), i, localObject1.getZ());
@@ -384,46 +363,34 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         Block localBlock1 = localIBlockData.getBlock();
         Material localMaterial = localIBlockData.getMaterial();
         PathType localPathType1 = PathType.BLOCKED;
-        if ((localBlock1 == Blocks.TRAPDOOR) || (localBlock1 == Blocks.IRON_TRAPDOOR)
-                || (localBlock1 == Blocks.WATERLILY)) {
+        if (localBlock1 == Blocks.TRAPDOOR || localBlock1 == Blocks.IRON_TRAPDOOR || localBlock1 == Blocks.WATERLILY)
             return PathType.TRAPDOOR;
-        }
-        if (localBlock1 == Blocks.FIRE) {
+        if (localBlock1 == Blocks.FIRE)
             return PathType.DAMAGE_FIRE;
-        }
-        if (localBlock1 == Blocks.CACTUS) {
+        if (localBlock1 == Blocks.CACTUS)
             return PathType.DAMAGE_CACTUS;
-        }
-        if (((localBlock1 instanceof BlockDoor)) && (localMaterial == Material.WOOD)
-                && (!localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock1 instanceof BlockDoor && localMaterial == Material.WOOD
+                && !localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_WOOD_CLOSED;
-        }
-        if (((localBlock1 instanceof BlockDoor)) && (localMaterial == Material.ORE)
-                && (!localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock1 instanceof BlockDoor && localMaterial == Material.ORE
+                && !localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_IRON_CLOSED;
-        }
-        if (((localBlock1 instanceof BlockDoor)) && (localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock1 instanceof BlockDoor && localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_OPEN;
-        }
-        if ((localBlock1 instanceof BlockMinecartTrackAbstract)) {
+        if (localBlock1 instanceof BlockMinecartTrackAbstract)
             return PathType.RAIL;
-        }
-        if (((localBlock1 instanceof BlockFence)) || ((localBlock1 instanceof BlockCobbleWall))
-                || (((localBlock1 instanceof BlockFenceGate))
-                        && (!localIBlockData.get(BlockFenceGate.OPEN).booleanValue()))) {
+        if (localBlock1 instanceof BlockFence || localBlock1 instanceof BlockCobbleWall
+                || localBlock1 instanceof BlockFenceGate && !localIBlockData.get(BlockFenceGate.OPEN).booleanValue())
             return PathType.FENCE;
-        }
         if (localMaterial == Material.AIR) {
             localPathType1 = PathType.OPEN;
         } else {
-            if (localMaterial == Material.WATER) {
+            if (localMaterial == Material.WATER)
                 return PathType.WATER;
-            }
-            if (localMaterial == Material.LAVA) {
+            if (localMaterial == Material.LAVA)
                 return PathType.LAVA;
-            }
         }
-        if ((localBlock1.b(paramIBlockAccess, localBlockPosition)) && (localPathType1 == PathType.BLOCKED)) {
+        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 0099de3c3..5d204eee0 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
@@ -46,9 +46,9 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
 
         if (entityplayer != tracker && c(entityplayer)) {
             if (!this.trackedPlayers.contains(entityplayer)
-                    && ((entityplayer.x().getPlayerChunkMap().a(entityplayer, tracker.ac, tracker.ae))
-                            || (tracker.attachedToPlayer))) {
-                if ((tracker instanceof SkinnableEntity)) {
+                    && (entityplayer.x().getPlayerChunkMap().a(entityplayer, tracker.ac, tracker.ae)
+                            || tracker.attachedToPlayer)) {
+                if (tracker instanceof SkinnableEntity) {
                     SkinnableEntity skinnable = (SkinnableEntity) tracker;
                     Player player = skinnable.getBukkitEntity();
                     if (!entityplayer.getBukkitEntity().canSee(player))
@@ -65,9 +65,8 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
     private static int getE(EntityTrackerEntry entry) {
         try {
             Entity entity = getTracker(entry);
-            if (entity instanceof NPCHolder) {
+            if (entity instanceof NPCHolder)
                 return ((NPCHolder) entity).getNPC().data().get(NPC.Metadata.TRACKING_RANGE, (Integer) E.get(entry));
-            }
             return (Integer) E.get(entry);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
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 63c3bdc5f..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
@@ -66,9 +66,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
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 2707a30e5..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
@@ -67,7 +67,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 aa2dae3b2..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
@@ -64,7 +64,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 d40be15cc..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
@@ -73,7 +73,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,11 +176,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 54e26dfac..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
@@ -82,7 +82,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -185,11 +185,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 871499f71..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
@@ -86,7 +86,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -95,9 +95,8 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -200,11 +199,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 33269076c..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
@@ -76,7 +76,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -105,8 +105,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -185,11 +186,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 a91de8d49..2a3071a34 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
@@ -71,7 +71,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -100,8 +100,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
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 26d97b177..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
@@ -73,7 +73,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,8 +102,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -160,9 +161,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean j(double d1, double d2, double d3) {
-            if (npc == null) {
+            if (npc == null)
                 return super.j(d1, d2, d3);
-            }
             return false;
         }
 
@@ -183,11 +183,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 3441299d9..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
@@ -73,7 +73,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,8 +102,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -168,17 +169,17 @@ public class EndermiteController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 dceb6b7ba..c5a48dcb0 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
@@ -97,9 +97,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && !isTracked) {
+        if (npc != null && !isTracked)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -151,12 +150,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -165,16 +159,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                world.removeEntity(EntityHumanNPC.this);
-            }
-        }, 15); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> world.removeEntity(EntityHumanNPC.this), 15); // give enough time for death and smoke animation
     }
 
     @Override
@@ -228,9 +216,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public IChatBaseComponent getPlayerListName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new ChatComponentText("");
-        }
         return super.getPlayerListName();
     }
 
@@ -250,9 +237,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -289,11 +275,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean m_() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.m_();
-        } else {
+        else
             return false;
-        }
     }
 
     private void moveOnCurrentHeading() {
@@ -410,7 +395,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
                 if (cache != null && !cache.isEmpty()) {
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 e672f7ffc..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
@@ -59,7 +59,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +162,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 7ce31d773..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
@@ -50,7 +50,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 b068d68b9..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
@@ -59,7 +59,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -161,11 +162,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8aca051d9..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
@@ -59,7 +59,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -154,11 +154,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 b00b4e70c..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
@@ -59,7 +59,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -154,11 +154,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 41a51ac1f..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
@@ -48,6 +48,7 @@ public class HorseController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseNPC(World world) {
             this(world, null);
         }
@@ -84,7 +85,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,11 +199,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 40a4637cf..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
@@ -49,6 +49,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseDonkeyNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -200,11 +201,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 db6cec365..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
@@ -49,6 +49,7 @@ public class HorseMuleController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseMuleNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -200,11 +201,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 d3a2e7dc1..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
@@ -49,6 +49,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseSkeletonNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -200,11 +201,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 f8dc7e39b..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
@@ -49,6 +49,7 @@ public class HorseZombieController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseZombieNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -200,11 +201,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 8668fcc01..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_11_R1.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 aa6c4c4d3..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
@@ -59,7 +59,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -161,11 +162,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 11780229e..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
@@ -79,7 +79,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -184,11 +184,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 5a528c460..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
@@ -65,7 +65,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,8 +102,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +175,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 96785615b..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
@@ -75,7 +75,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_11_R1.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 ba06587be..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
@@ -70,7 +70,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -106,8 +106,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -172,17 +173,17 @@ public class MushroomCowController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 fb1103f5d..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
@@ -68,7 +68,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,8 +97,9 @@ public class OcelotController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -170,17 +171,17 @@ public class OcelotController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 f00f4d432..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
@@ -69,7 +69,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -178,11 +178,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 1d31aaa24..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
@@ -59,7 +59,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -161,11 +162,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 22cdf2852..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
@@ -59,7 +59,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 dec5d1baf..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
@@ -69,7 +69,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -180,11 +180,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 7fb91bf51..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
@@ -68,7 +68,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,8 +97,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -163,17 +164,17 @@ public class SheepController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 084808f81..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
@@ -61,7 +61,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -99,8 +99,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -139,8 +140,9 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -163,11 +165,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 a779c9eca..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
@@ -59,7 +59,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class SilverfishController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 43852162f..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
@@ -59,7 +59,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 7d74fae2e..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
@@ -59,7 +59,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new StrayNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 ffd6540b7..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
@@ -59,7 +59,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonWitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 bac915a71..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
@@ -65,7 +65,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -150,8 +150,9 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -174,11 +175,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 cb8c034ea..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
@@ -59,7 +59,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 3590acc20..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
@@ -59,7 +59,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class SpiderController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 0532ff0d8..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
@@ -59,7 +59,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class SquidController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -152,11 +154,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 d2783b038..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
@@ -53,7 +53,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,8 +107,9 @@ public class VexController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VexNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 6b2f59865..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
@@ -76,7 +76,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,8 +167,9 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -199,11 +200,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 cdf2d125e..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
@@ -68,7 +68,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -138,8 +138,9 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VindicatorNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -170,11 +171,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 c2803e156..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
@@ -59,7 +59,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class WitchController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,17 +155,17 @@ public class WitchController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 ace0a5590..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
@@ -50,7 +50,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -79,8 +79,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -109,8 +110,9 @@ public class WitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 01115b397..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
@@ -70,7 +70,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -140,8 +140,9 @@ public class WolfController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -172,11 +173,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 64218df68..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
@@ -59,7 +59,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 e481399df..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
@@ -59,7 +59,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieHuskNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 6a6bfee26..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
@@ -59,7 +59,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,8 +88,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -128,8 +129,9 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieVillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +162,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 1e25b64b3..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
@@ -53,9 +53,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
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 1c32b8f29..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.getBlock().a(block, null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
@@ -66,7 +66,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CustomEntityRegistry.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CustomEntityRegistry.java
index c3c4f6d65..ebf2b1db5 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CustomEntityRegistry.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CustomEntityRegistry.java
@@ -33,9 +33,8 @@ public class CustomEntityRegistry extends RegistryMaterials
 
     @Override
     public int a(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.a((Class<? extends Entity>) key);
     }
 
@@ -46,9 +45,8 @@ public class CustomEntityRegistry extends RegistryMaterials
 
     @Override
     public MinecraftKey b(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.b((Class<? extends Entity>) value);
     }
 
@@ -64,9 +62,8 @@ public class CustomEntityRegistry extends RegistryMaterials
 
     @Override
     public Class<? extends Entity> get(Object key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get((MinecraftKey) key);
     }
 
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 dc5b9da15..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
@@ -411,9 +411,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().az();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -451,9 +450,8 @@ public class NMSImpl implements NMSBridge {
             }
         } catch (Exception e) {
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
@@ -484,9 +482,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.a()) {
+        if (controller == null || !controller.a())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -497,9 +494,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aP;
     }
 
@@ -560,7 +556,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -608,8 +604,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -627,23 +623,14 @@ public class NMSImpl implements NMSBridge {
                 Iterables.transform(dest,
                         input -> new PathPoint(input.getBlockX(), input.getBlockY(), input.getBlockZ())),
                 PathPoint.class));
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -737,11 +724,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -890,7 +876,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -900,8 +886,9 @@ public class NMSImpl implements NMSBridge {
             double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff);
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY)) - 90;
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -932,7 +919,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -979,8 +966,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(new Location(player.getWorld(), 0, 0, 0),
@@ -991,8 +976,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.windowId = handle.nextContainerCounter();
@@ -1030,12 +1015,11 @@ public class NMSImpl implements NMSBridge {
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.playerTick();
-            if (!removeFromPlayerList) {
+            if (!removeFromPlayerList)
                 return;
-            }
             Entity entity1 = entity.bB();
             if (entity1 != null) {
-                if ((entity1.dead) || (!entity1.w(entity))) {
+                if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
             } else {
@@ -1069,8 +1053,9 @@ public class NMSImpl implements NMSBridge {
         Class<?> search = clazz;
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             MinecraftKey key = ENTITY_REGISTRY.b(search);
-            if (key == null)
+            if (key == null) {
                 continue;
+            }
             int code = ENTITY_REGISTRY.a(search);
             ENTITY_REGISTRY.put(code, key, (Class<? extends Entity>) clazz);
             return;
@@ -1406,8 +1391,8 @@ public class NMSImpl implements NMSBridge {
         EntityPlayer from = (EntityPlayer) getHandle(entity);
         PerPlayerMetadata<Long> meta = CitizensAPI.getLocationLookup().registerMetadata("sleeping", null);
         if (sleep) {
-            List<Player> nearbyPlayers = Lists.newArrayList(Iterables
-                    .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> {
+            List<Player> nearbyPlayers = Lists.newArrayList(
+                    Iterables.filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), p -> {
                         Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString());
                         if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000)
                             return true;
@@ -1446,7 +1431,7 @@ public class NMSImpl implements NMSBridge {
             list.add(new PacketPlayOutEntityTeleport(from));
             for (Player nearby : nearbyPlayers) {
                 nearby.sendBlockChange(bedLoc, Material.BED_BLOCK, facingByte);
-                list.forEach((packet) -> sendPacket(nearby, packet));
+                list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
         } else {
@@ -1575,9 +1560,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1650,9 +1634,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_11_R1.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1661,25 +1644,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_11_R1.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_11_R1.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_11_R1.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_11_R1.NBTTagInt) base).e());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_11_R1.NBTTagFloat) base).i());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_11_R1.NBTTagDouble) base).asDouble());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_11_R1.NBTTagLong) base).d());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_11_R1.NBTTagShort) base).f());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_11_R1.NBTTagByte) base).g());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_11_R1.NBTTagByteArray) base).c());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_11_R1.NBTTagIntArray) base).d());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagString)
             return new StringTag(key, base.toString());
-        } else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_11_R1.NBTTagList) {
             List<net.minecraft.server.v1_11_R1.NBTBase> list = (List<net.minecraft.server.v1_11_R1.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1689,17 +1672,15 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(EntityLiving entity, float f, float f1) {
-        if ((entity.cu()) || (entity.bA())) {
+        if (entity.cu() || entity.bA()) {
             if (entity.isInWater()) {
                 double d1 = entity.locY;
                 float f4 = entity instanceof EntityPolarBear ? 0.98F : 0.8F;
@@ -1723,12 +1704,12 @@ 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))) {
+                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))) {
+            } else if (entity.ao()
+                    && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d1 = entity.locY;
                 entity.a(f, f1, 0.02F);
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
@@ -1738,8 +1719,8 @@ 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))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d1, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
             } else if (entity.cH()) {
@@ -1754,7 +1735,7 @@ public class NMSImpl implements NMSBridge {
                 float f6 = MathHelper.cos(f5);
                 f6 = (float) (f6 * f6 * Math.min(1.0D, d3 / 0.4D));
                 entity.motY += -0.08D + f6 * 0.06D;
-                if ((entity.motY < 0.0D) && (d0 > 0.0D)) {
+                if (entity.motY < 0.0D && d0 > 0.0D) {
                     double d4 = entity.motY * -0.1D * f6;
                     entity.motY += d4;
                     entity.motX += vec3d.x * d4 / d0;
@@ -1774,7 +1755,7 @@ public class NMSImpl implements NMSBridge {
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
-                if ((entity.positionChanged) && (!entity.world.isClientSide)) {
+                if (entity.positionChanged && !entity.world.isClientSide) {
                     double d4 = Math.sqrt(entity.motX * entity.motX + entity.motZ * entity.motZ);
                     double d5 = d2 - d4;
                     float f7 = (float) (d5 * 10.0D - 3.0D);
@@ -1783,8 +1764,8 @@ public class NMSImpl implements NMSBridge {
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f7);
                     }
                 }
-                if ((entity.onGround) && (!entity.world.isClientSide) && (entity.getFlag(7))
-                        && (!CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())) {
+                if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
             } else {
@@ -1814,13 +1795,13 @@ 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)) {
+                    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_())) {
+                if (entity.positionChanged && entity.m_()) {
                     entity.motY = 0.2D;
                 }
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -1828,8 +1809,8 @@ public class NMSImpl implements NMSBridge {
                             * 0.2D;
                 } else {
                     blockposition_pooledblockposition.e(entity.locX, 0.0D, entity.locZ);
-                    if ((entity.world.isClientSide) && ((!entity.world.isLoaded(blockposition_pooledblockposition))
-                            || (!entity.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p()))) {
+                    if (entity.world.isClientSide && (!entity.world.isLoaded(blockposition_pooledblockposition)
+                            || !entity.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p())) {
                         if (entity.locY > 0.0D) {
                             entity.motY = -0.1D;
                         } else {
@@ -1939,7 +1920,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -1948,8 +1929,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
@@ -1971,15 +1952,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
-        if ((f != entity.width) || (f1 != entity.length)) {
+        if (f != entity.width || f1 != entity.length) {
             float f2 = entity.width;
             entity.width = f;
             entity.length = f1;
             entity.a(new AxisAlignedBB(entity.getBoundingBox().a, entity.getBoundingBox().b, entity.getBoundingBox().c,
                     entity.getBoundingBox().a + entity.width, entity.getBoundingBox().b + entity.length,
                     entity.getBoundingBox().c + entity.width));
-            if ((entity.width > f2) && (!justCreated) && (!entity.world.isClientSide))
+            if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
+            }
         }
     }
 
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 34a47ddd0..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
@@ -54,9 +54,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
@@ -78,7 +78,7 @@ public class PlayerControllerMove extends ControllerMove {
             double d2 = this.c - i;
             double d3 = d0 * d0 + d2 * d2 + d1 * d1;
             if (d3 < 2.500000277905201E-007D) {
-                this.a.bf = (0.0F);
+                this.a.bf = 0.0F;
                 return;
             }
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
@@ -92,7 +92,7 @@ public class PlayerControllerMove extends ControllerMove {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;
                 ((EntityInsentient) this.a).getControllerJump().a();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 if (this.a instanceof EntityHumanNPC) {
                     ((EntityHumanNPC) this.a).getControllerJump().a();
                 } else {
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 f6f3d4232..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
@@ -65,23 +65,21 @@ public class PlayerNavigation extends NavigationAbstract {
         BlockPosition localBlockPosition;
         if (this.b.getType(paramBlockPosition).getMaterial() == Material.AIR) {
             localBlockPosition = paramBlockPosition.down();
-            while ((localBlockPosition.getY() > 0)
-                    && (this.b.getType(localBlockPosition).getMaterial() == Material.AIR)) {
+            while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.down();
             }
-            if (localBlockPosition.getY() > 0) {
+            if (localBlockPosition.getY() > 0)
                 return a2(localBlockPosition.up());
-            }
-            while ((localBlockPosition.getY() < this.b.getHeight())
-                    && (this.b.getType(localBlockPosition).getMaterial() == Material.AIR)) {
+            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())) {
+            while (localBlockPosition.getY() < this.b.getHeight()
+                    && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
             return a2(localBlockPosition);
@@ -111,16 +109,15 @@ public class PlayerNavigation extends NavigationAbstract {
     @Override
     public boolean a(Entity paramEntity, double paramDouble) {
         PathEntity localPathEntity = a(paramEntity);
-        return (localPathEntity != null) && (a(localPathEntity, paramDouble));
+        return localPathEntity != null && a(localPathEntity, paramDouble);
     }
 
     private boolean a(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6,
             Vec3D paramVec3D, double paramDouble1, double paramDouble2) {
         int i = paramInt1 - paramInt4 / 2;
         int j = paramInt3 - paramInt6 / 2;
-        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2)) {
+        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2))
             return false;
-        }
         for (int k = i; k < i + paramInt4; k++) {
             for (int m = j; m < j + paramInt6; m++) {
                 double d1 = k + 0.5D - paramVec3D.x;
@@ -128,20 +125,17 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                     PathType localPathType = this.e.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5,
                             paramInt6, true, true);
-                    if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA)
-                            || (localPathType == PathType.OPEN)) {
+                    if (localPathType == PathType.WATER || localPathType == PathType.LAVA
+                            || localPathType == PathType.OPEN)
                         return false;
-                    }
                     localPathType = this.e.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true,
                             true);
                     float f1 = this.a.a(localPathType);
-                    if ((f1 < 0.0F) || (f1 >= 8.0F)) {
+                    if (f1 < 0.0F || f1 >= 8.0F)
                         return false;
-                    }
-                    if ((localPathType == PathType.DAMAGE_FIRE) || (localPathType == PathType.DANGER_FIRE)
-                            || (localPathType == PathType.DAMAGE_OTHER)) {
+                    if (localPathType == PathType.DAMAGE_FIRE || localPathType == PathType.DANGER_FIRE
+                            || localPathType == PathType.DAMAGE_OTHER)
                         return false;
-                    }
                 }
             }
         }
@@ -158,9 +152,8 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = paramPathEntity;
         }
         d();
-        if (this.c.d() == 0) {
+        if (this.c.d() == 0)
             return false;
-        }
         this.d = paramDouble;
         Vec3D localVec3D = c();
         this.h = this.g;
@@ -177,16 +170,16 @@ public class PlayerNavigation extends NavigationAbstract {
             this.h = this.g;
             this.i = paramVec3D;
         }
-        if ((this.c != null) && (!this.c.b())) {
+        if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (localVec3D.equals(this.j)) {
                 this.k += System.currentTimeMillis() - this.l;
             } else {
                 this.j = localVec3D;
                 double d1 = paramVec3D.f(this.j);
-                this.m = (this.a.cq() > 0.0F ? d1 / this.a.cq() * 1000.0D : 0.0D);
+                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)) {
+            if (this.m > 0.0D && this.k > this.m * 3.0D) {
                 this.j = Vec3D.a;
                 this.k = 0L;
                 this.m = 0.0D;
@@ -203,17 +196,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double d1 = paramVec3D2.x - paramVec3D1.x;
         double d2 = paramVec3D2.z - paramVec3D1.z;
         double d3 = d1 * d1 + d2 * d2;
-        if (d3 < 1.0E-8D) {
+        if (d3 < 1.0E-8D)
             return false;
-        }
         double d4 = 1.0D / Math.sqrt(d3);
         d1 *= d4;
         d2 *= d4;
         paramInt1 += 2;
         paramInt3 += 2;
-        if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+        if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
             return false;
-        }
         paramInt1 -= 2;
         paramInt3 -= 2;
         double d5 = 1.0D / Math.abs(d1);
@@ -234,7 +225,7 @@ public class PlayerNavigation extends NavigationAbstract {
         int i1 = MathHelper.floor(paramVec3D2.z);
         int i2 = n - i;
         int i3 = i1 - j;
-        while ((i2 * k > 0) || (i3 * m > 0)) {
+        while (i2 * k > 0 || i3 * m > 0) {
             if (d7 < d8) {
                 d7 += d5;
                 i += k;
@@ -244,20 +235,17 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-            if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+            if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
-            }
         }
         return true;
     }
 
     public PathEntity a2(BlockPosition paramBlockPosition) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
-        if ((this.c != null) && (!this.c.b()) && (paramBlockPosition.equals(this.q))) {
+        if (this.c != null && !this.c.b() && paramBlockPosition.equals(this.q))
             return this.c;
-        }
         this.q = paramBlockPosition;
         float f1 = h();
         this.b.methodProfiler.a("pathfind");
@@ -271,13 +259,11 @@ public class PlayerNavigation extends NavigationAbstract {
     }
 
     public PathEntity a2(Entity paramEntity) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
         BlockPosition localBlockPosition1 = new BlockPosition(paramEntity);
-        if ((this.c != null) && (!this.c.b()) && (localBlockPosition1.equals(this.q))) {
+        if (this.c != null && !this.c.b() && localBlockPosition1.equals(this.q))
             return this.c;
-        }
         this.q = localBlockPosition1;
         float f1 = h();
         this.b.methodProfiler.a("pathfind");
@@ -292,7 +278,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean b() {
-        return (this.a.onGround) || ((g()) && (p())) || (this.a.isPassenger());
+        return this.a.onGround || g() && p() || this.a.isPassenger();
     }
 
     @Override
@@ -312,9 +298,8 @@ public class PlayerNavigation extends NavigationAbstract {
             double d2 = localBlockPosition.getZ() + 0.5D - paramVec3D.z;
             if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                 Block localBlock = this.b.getType(localBlockPosition).getBlock();
-                if (!localBlock.b(this.b, localBlockPosition)) {
+                if (!localBlock.b(this.b, localBlockPosition))
                     return false;
-                }
             }
         }
         return true;
@@ -340,7 +325,7 @@ public class PlayerNavigation extends NavigationAbstract {
             Block localBlock = localIBlockData.getBlock();
             if (localBlock == Blocks.cauldron) {
                 this.c.a(i, localPathPoint.a(localPathPoint.a, localPathPoint.b + 1, localPathPoint.c));
-                if ((localObject != null) && (localPathPoint.b >= ((PathPoint) localObject).b)) {
+                if (localObject != null && localPathPoint.b >= ((PathPoint) localObject).b) {
                     this.c.a(i + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1,
                             ((PathPoint) localObject).c));
                 }
@@ -348,9 +333,8 @@ public class PlayerNavigation extends NavigationAbstract {
         }
         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)))) {
+                    MathHelper.floor(this.a.locZ))))
                 return;
-            }
             for (int i = 0; i < this.c.d(); i++) {
                 localPathPoint = this.c.a(i);
                 if (this.b.h(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c))) {
@@ -408,27 +392,24 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.o) {
             j();
         }
-        if (n()) {
+        if (n())
             return;
-        }
         if (b()) {
             m();
-        } else if ((this.c != null) && (this.c.e() < this.c.d())) {
+        } else if (this.c != null && this.c.e() < this.c.d()) {
             Vec3D localVec3D = c();
             Vec3D localObject = this.c.a(this.a, this.c.e());
-            if ((localVec3D.y > localObject.y) && (!this.a.onGround)
-                    && (MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x))
-                    && (MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z))) {
+            if (localVec3D.y > localObject.y && !this.a.onGround
+                    && MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x)
+                    && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
         }
-        if (n()) {
+        if (n())
             return;
-        }
         Vec3D localVec3D = this.c.a(this.a);
-        if (localVec3D == null) {
+        if (localVec3D == null)
             return;
-        }
         Object localObject = new BlockPosition(localVec3D).down();
         AxisAlignedBB localAxisAlignedBB = this.b.getType((BlockPosition) localObject).d(this.b,
                 (BlockPosition) localObject);
@@ -446,11 +427,11 @@ public class PlayerNavigation extends NavigationAbstract {
                 break;
             }
         }
-        this.n = (this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F);
+        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)
-                && (MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.n)
-                && (Math.abs(this.a.locY - localVec3D2.y) < 1.0D)) {
+        if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.n
+                && MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.n
+                && Math.abs(this.a.locY - localVec3D2.y) < 1.0D) {
             this.c.c(this.c.e() + 1);
         }
         int i3 = MathHelper.f(this.a.width);
@@ -467,7 +448,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public boolean n() {
-        return (this.c == null) || (this.c.b());
+        return this.c == null || this.c.b();
     }
 
     @Override
@@ -477,7 +458,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean p() {
-        return (this.a.isInWater()) || (this.a.ao());
+        return this.a.isInWater() || this.a.ao();
     }
 
     @Override
@@ -486,22 +467,20 @@ public class PlayerNavigation extends NavigationAbstract {
     }
 
     private int r() {
-        if ((!this.a.isInWater()) || (!g())) {
+        if (!this.a.isInWater() || !g())
             return (int) (this.a.getBoundingBox().b + 0.5D);
-        }
         int i = (int) this.a.getBoundingBox().b;
         Block localBlock = this.b
                 .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ))).getBlock();
         int j = 0;
-        while ((localBlock == Blocks.FLOWING_WATER) || (localBlock == Blocks.WATER)) {
+        while (localBlock == Blocks.FLOWING_WATER || localBlock == Blocks.WATER) {
             i++;
             localBlock = this.b
                     .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ)))
                     .getBlock();
             j++;
-            if (j > 16) {
+            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 c3138b082..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
@@ -13,7 +13,7 @@ import net.minecraft.server.v1_11_R1.PathPoint;
 
 public class PlayerPathfinder {
     private final Path a = new Path();
-    private final Set<PathPoint> b = new HashSet<PathPoint>();
+    private final Set<PathPoint> b = new HashSet<>();
     private final PathPoint[] c = new PathPoint[32];
     private final PlayerPathfinderNormal d;
 
@@ -53,10 +53,10 @@ public class PlayerPathfinder {
         }
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
-        arrayOfPathPoint[(--i)] = localPathPoint;
+        arrayOfPathPoint[--i] = localPathPoint;
         while (localPathPoint.h != null) {
             localPathPoint = localPathPoint.h;
-            arrayOfPathPoint[(--i)] = localPathPoint;
+            arrayOfPathPoint[--i] = localPathPoint;
         }
         return new PathEntity(arrayOfPathPoint);
     }
@@ -88,25 +88,24 @@ public class PlayerPathfinder {
             for (int k = 0; k < j; k++) {
                 PathPoint localPathPoint = this.c[k];
                 float f1 = localObject2.c(localPathPoint);
-                localPathPoint.j = (localObject2.j + f1);
-                localPathPoint.k = (f1 + localPathPoint.l);
+                localPathPoint.j = localObject2.j + f1;
+                localPathPoint.k = f1 + localPathPoint.l;
                 float f2 = localObject2.e + localPathPoint.k;
-                if ((localPathPoint.j < paramFloat) && ((!localPathPoint.a()) || (f2 < localPathPoint.e))) {
-                    localPathPoint.h = (localObject2);
+                if (localPathPoint.j < paramFloat && (!localPathPoint.a() || f2 < localPathPoint.e)) {
+                    localPathPoint.h = localObject2;
                     localPathPoint.e = f2;
-                    localPathPoint.f = (localPathPoint.c(paramPathPoint2) + localPathPoint.l);
+                    localPathPoint.f = localPathPoint.c(paramPathPoint2) + localPathPoint.l;
                     if (localPathPoint.a()) {
                         this.a.a(localPathPoint, localPathPoint.e + localPathPoint.f);
                     } else {
-                        localPathPoint.g = (localPathPoint.e + localPathPoint.f);
+                        localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
                 }
             }
         }
-        if (localObject1 == paramPathPoint1) {
+        if (localObject1 == paramPathPoint1)
             return null;
-        }
         Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1);
         return (PathEntity) localObject2;
     }
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 813e0ccef..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
@@ -51,14 +51,14 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     @Override
     public PathType a(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) {
         PathType localPathType1 = b(paramIBlockAccess, paramInt1, paramInt2, paramInt3);
-        if ((localPathType1 == PathType.OPEN) && (paramInt2 >= 1)) {
+        if (localPathType1 == PathType.OPEN && paramInt2 >= 1) {
             Block localObject = paramIBlockAccess.getType(new BlockPosition(paramInt1, paramInt2 - 1, paramInt3))
                     .getBlock();
             PathType localPathType2 = b(paramIBlockAccess, paramInt1, paramInt2 - 1, paramInt3);
-            localPathType1 = (localPathType2 == PathType.WALKABLE) || (localPathType2 == PathType.OPEN)
-                    || (localPathType2 == PathType.WATER) || (localPathType2 == PathType.LAVA) ? PathType.OPEN
+            localPathType1 = localPathType2 == PathType.WALKABLE || localPathType2 == PathType.OPEN
+                    || localPathType2 == PathType.WATER || localPathType2 == PathType.LAVA ? PathType.OPEN
                             : PathType.WALKABLE;
-            if ((localPathType2 == PathType.DAMAGE_FIRE) || (localObject == Blocks.df)) {
+            if (localPathType2 == PathType.DAMAGE_FIRE || localObject == Blocks.df) {
                 localPathType1 = PathType.DAMAGE_FIRE;
             }
             if (localPathType2 == PathType.DAMAGE_CACTUS) {
@@ -69,7 +69,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (localPathType1 == PathType.WALKABLE) {
             for (int i = -1; i <= 1; i++) {
                 for (int k = -1; k <= 1; k++) {
-                    if ((i != 0) || (k != 0)) {
+                    if (i != 0 || k != 0) {
                         Block localBlock = paramIBlockAccess.getType(((BlockPosition.PooledBlockPosition) localObject)
                                 .f(i + paramInt1, paramInt2, k + paramInt3)).getBlock();
                         if (localBlock == Blocks.CACTUS) {
@@ -99,41 +99,38 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     int i1 = k + paramInt2;
                     int i2 = m + paramInt3;
                     PathType localPathType2 = a(paramIBlockAccess, n, i1, i2);
-                    if ((localPathType2 == PathType.DOOR_WOOD_CLOSED) && (paramBoolean1) && (paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-                    if ((localPathType2 == PathType.DOOR_OPEN) && (!paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-                    if ((localPathType2 == PathType.RAIL)
-                            && (!(paramIBlockAccess.getType(localBlockPosition)
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))
-                            && (!(paramIBlockAccess.getType(localBlockPosition.down())
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))) {
+                    if (localPathType2 == PathType.RAIL
+                            && !(paramIBlockAccess.getType(localBlockPosition)
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)
+                            && !(paramIBlockAccess.getType(localBlockPosition.down())
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-                    if ((i == 0) && (k == 0) && (m == 0)) {
+                    if (i == 0 && k == 0 && m == 0) {
                         localObject1 = localPathType2;
                     }
                     localEnumSet.add(localPathType2);
                 }
             }
         }
-        if (localEnumSet.contains(PathType.FENCE)) {
+        if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
-        }
         PathType localObject2 = PathType.BLOCKED;
         for (PathType localPathType1 : localEnumSet) {
-            if (paramEntityInsentient.a(localPathType1) < 0.0F) {
+            if (paramEntityInsentient.a(localPathType1) < 0.0F)
                 return localPathType1;
-            }
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a(localObject2)) {
                 localObject2 = localPathType1;
             }
         }
-        if ((localObject1 == PathType.OPEN) && (paramEntityInsentient.a(localObject2) == 0.0F)) {
+        if (localObject1 == PathType.OPEN && paramEntityInsentient.a(localObject2) == 0.0F)
             return PathType.OPEN;
-        }
         return localObject2;
     }
 
@@ -151,41 +148,38 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     int i1 = k + paramInt2;
                     int i2 = m + paramInt3;
                     PathType localPathType2 = a(paramIBlockAccess, n, i1, i2);
-                    if ((localPathType2 == PathType.DOOR_WOOD_CLOSED) && (paramBoolean1) && (paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType2 = PathType.WALKABLE;
                     }
-                    if ((localPathType2 == PathType.DOOR_OPEN) && (!paramBoolean2)) {
+                    if (localPathType2 == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType2 = PathType.BLOCKED;
                     }
-                    if ((localPathType2 == PathType.RAIL)
-                            && (!(paramIBlockAccess.getType(localBlockPosition)
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))
-                            && (!(paramIBlockAccess.getType(localBlockPosition.down())
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))) {
+                    if (localPathType2 == PathType.RAIL
+                            && !(paramIBlockAccess.getType(localBlockPosition)
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)
+                            && !(paramIBlockAccess.getType(localBlockPosition.down())
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType2 = PathType.FENCE;
                     }
-                    if ((i == 0) && (k == 0) && (m == 0)) {
+                    if (i == 0 && k == 0 && m == 0) {
                         localObject1 = localPathType2;
                     }
                     localEnumSet.add(localPathType2);
                 }
             }
         }
-        if (localEnumSet.contains(PathType.FENCE)) {
+        if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
-        }
         PathType localObject2 = PathType.BLOCKED;
         for (PathType localPathType1 : localEnumSet) {
-            if (paramEntityInsentient.a(localPathType1) < 0.0F) {
+            if (paramEntityInsentient.a(localPathType1) < 0.0F)
                 return localPathType1;
-            }
             if (paramEntityInsentient.a(localPathType1) >= paramEntityInsentient.a(localObject2)) {
                 localObject2 = localPathType1;
             }
         }
-        if ((localObject1 == PathType.OPEN) && (paramEntityInsentient.a(localObject2) == 0.0F)) {
+        if (localObject1 == PathType.OPEN && paramEntityInsentient.a(localObject2) == 0.0F)
             return PathType.OPEN;
-        }
         return localObject2;
     }
 
@@ -195,9 +189,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         BlockPosition localBlockPosition1 = new BlockPosition(paramInt1, paramInt2, paramInt3);
         BlockPosition localBlockPosition2 = localBlockPosition1.down();
         double d1 = paramInt2 - (1.0D - this.a.getType(localBlockPosition2).d(this.a, localBlockPosition2).e);
-        if (d1 - paramDouble > 1.125D) {
+        if (d1 - paramDouble > 1.125D)
             return null;
-        }
         PathType localPathType1 = a(this.b, paramInt1, paramInt2, paramInt3);
         float f = this.b.a(localPathType1);
         double d2 = this.b.width / 2.0D;
@@ -206,15 +199,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localPathPoint.m = localPathType1;
             localPathPoint.l = Math.max(localPathPoint.l, f);
         }
-        if (localPathType1 == PathType.WALKABLE) {
+        if (localPathType1 == PathType.WALKABLE)
             return localPathPoint;
-        }
-        if ((localPathPoint == null) && (paramInt4 > 0) && (localPathType1 != PathType.FENCE)
-                && (localPathType1 != PathType.TRAPDOOR)) {
+        if (localPathPoint == null && paramInt4 > 0 && localPathType1 != PathType.FENCE
+                && localPathType1 != PathType.TRAPDOOR) {
             localPathPoint = a(paramInt1, paramInt2 + 1, paramInt3, paramInt4 - 1, paramDouble, paramEnumDirection);
-            if ((localPathPoint != null)
-                    && ((localPathPoint.m == PathType.OPEN) || (localPathPoint.m == PathType.WALKABLE))
-                    && (this.b.width < 1.0F)) {
+            if (localPathPoint != null && (localPathPoint.m == PathType.OPEN || localPathPoint.m == PathType.WALKABLE)
+                    && this.b.width < 1.0F) {
                 double d3 = paramInt1 - paramEnumDirection.getAdjacentX() + 0.5D;
                 double d4 = paramInt3 - paramEnumDirection.getAdjacentZ() + 0.5D;
                 AxisAlignedBB localAxisAlignedBB1 = new AxisAlignedBB(d3 - d2, paramInt2 + 0.001D, d4 - d2, d3 + d2,
@@ -229,9 +220,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         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);
-            if (this.b.world.b(localAxisAlignedBB4)) {
+            if (this.b.world.b(localAxisAlignedBB4))
                 return null;
-            }
             if (this.b.width >= 1.0F) {
                 PathType localPathType2 = a(this.b, paramInt1, paramInt2 - 1, paramInt3);
                 if (localPathType2 == PathType.BLOCKED) {
@@ -242,20 +232,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 }
             }
             int i = 0;
-            while ((paramInt2 > 0) && (localPathType1 == PathType.OPEN)) {
+            while (paramInt2 > 0 && localPathType1 == PathType.OPEN) {
                 paramInt2--;
-                if (i++ >= b.aY()) {
+                if (i++ >= b.aY())
                     return null;
-                }
                 localPathType1 = a(this.b, paramInt1, paramInt2, paramInt3);
                 f = this.b.a(localPathType1);
-                if ((localPathType1 != PathType.OPEN) && (f >= 0.0F)) {
+                if (localPathType1 != PathType.OPEN && f >= 0.0F) {
                     localPathPoint = a(paramInt1, paramInt2, paramInt3);
                     localPathPoint.m = localPathType1;
                     localPathPoint.l = Math.max(localPathPoint.l, f);
-                } else if (f < 0.0F) {
+                } else if (f < 0.0F)
                     return null;
-                }
             }
         }
         return localPathPoint;
@@ -281,57 +269,49 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 EnumDirection.EAST);
         PathPoint localPathPoint4 = a(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
                 EnumDirection.NORTH);
-        if ((localPathPoint1 != null) && (!localPathPoint1.i) && (localPathPoint1.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint1;
+        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 (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[i++] = localPathPoint2;
         }
-        if ((localPathPoint3 != null) && (!localPathPoint3.i) && (localPathPoint3.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint3;
+        if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[i++] = localPathPoint3;
         }
-        if ((localPathPoint4 != null) && (!localPathPoint4.i) && (localPathPoint4.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint4;
+        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;
-        int i2 = (localPathPoint2 == null) || (localPathPoint2.m == PathType.OPEN) || (localPathPoint2.l != 0.0F) ? 1
-                : 0;
+        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;
+        int i2 = localPathPoint2 == null || localPathPoint2.m == PathType.OPEN || localPathPoint2.l != 0.0F ? 1 : 0;
         PathPoint localPathPoint5;
-        if ((m != 0) && (i2 != 0)) {
+        if (m != 0 && i2 != 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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((m != 0) && (i1 != 0)) {
+        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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((n != 0) && (i2 != 0)) {
+        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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((n != 0) && (i1 != 0)) {
+        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;
+            if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
         return i;
@@ -341,12 +321,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     public PathPoint b() {
         int i;
         BlockPosition localObject1;
-        if ((e()) && (this.b.isInWater())) {
+        if (e() && this.b.isInWater()) {
             i = (int) this.b.getBoundingBox().b;
             localObject1 = new BlockPosition.MutableBlockPosition(MathHelper.floor(this.b.locX), i,
                     MathHelper.floor(this.b.locZ));
             Block localObject2 = this.a.getType(localObject1).getBlock();
-            while ((localObject2 == Blocks.FLOWING_WATER) || (localObject2 == Blocks.WATER)) {
+            while (localObject2 == Blocks.FLOWING_WATER || localObject2 == Blocks.WATER) {
                 i++;
                 ((MutableBlockPosition) localObject1).c(MathHelper.floor(this.b.locX), i,
                         MathHelper.floor(this.b.locZ));
@@ -356,9 +336,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             i = MathHelper.floor(this.b.getBoundingBox().b + 0.5D);
         } else {
             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)) {
+            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();
@@ -373,9 +352,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().f));
             for (BlockPosition localBlockPosition : localHashSet) {
                 PathType localPathType = a(this.b, localBlockPosition);
-                if (this.b.a(localPathType) >= 0.0F) {
+                if (this.b.a(localPathType) >= 0.0F)
                     return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
-                }
             }
         }
         return a(localObject1.getX(), i, localObject1.getZ());
@@ -386,47 +364,33 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         IBlockData localIBlockData = paramIBlockAccess.getType(localBlockPosition);
         Block localBlock = localIBlockData.getBlock();
         Material localMaterial = localIBlockData.getMaterial();
-        if (localMaterial == Material.AIR) {
+        if (localMaterial == Material.AIR)
             return PathType.OPEN;
-        }
-        if ((localBlock == Blocks.TRAPDOOR) || (localBlock == Blocks.IRON_TRAPDOOR)
-                || (localBlock == Blocks.WATERLILY)) {
+        if (localBlock == Blocks.TRAPDOOR || localBlock == Blocks.IRON_TRAPDOOR || localBlock == Blocks.WATERLILY)
             return PathType.TRAPDOOR;
-        }
-        if (localBlock == Blocks.FIRE) {
+        if (localBlock == Blocks.FIRE)
             return PathType.DAMAGE_FIRE;
-        }
-        if (localBlock == Blocks.CACTUS) {
+        if (localBlock == Blocks.CACTUS)
             return PathType.DAMAGE_CACTUS;
-        }
-        if (((localBlock instanceof BlockDoor)) && (localMaterial == Material.WOOD)
-                && (!localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock instanceof BlockDoor && localMaterial == Material.WOOD
+                && !localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_WOOD_CLOSED;
-        }
-        if (((localBlock instanceof BlockDoor)) && (localMaterial == Material.ORE)
-                && (!localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock instanceof BlockDoor && localMaterial == Material.ORE
+                && !localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_IRON_CLOSED;
-        }
-        if (((localBlock instanceof BlockDoor)) && (localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock instanceof BlockDoor && localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_OPEN;
-        }
-        if ((localBlock instanceof BlockMinecartTrackAbstract)) {
+        if (localBlock instanceof BlockMinecartTrackAbstract)
             return PathType.RAIL;
-        }
-        if (((localBlock instanceof BlockFence)) || ((localBlock instanceof BlockCobbleWall))
-                || (((localBlock instanceof BlockFenceGate))
-                        && (!localIBlockData.get(BlockFenceGate.OPEN).booleanValue()))) {
+        if (localBlock instanceof BlockFence || localBlock instanceof BlockCobbleWall
+                || localBlock instanceof BlockFenceGate && !localIBlockData.get(BlockFenceGate.OPEN).booleanValue())
             return PathType.FENCE;
-        }
-        if (localMaterial == Material.WATER) {
+        if (localMaterial == Material.WATER)
             return PathType.WATER;
-        }
-        if (localMaterial == Material.LAVA) {
+        if (localMaterial == Material.LAVA)
             return PathType.LAVA;
-        }
-        if (localBlock.b(paramIBlockAccess, localBlockPosition)) {
+        if (localBlock.b(paramIBlockAccess, localBlockPosition))
             return PathType.OPEN;
-        }
         return PathType.BLOCKED;
     }
 }
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 76c4ee68d..ae9a9fff2 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
@@ -106,9 +106,8 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
     private static int getE(EntityTrackerEntry entry) {
         try {
             Entity entity = getTracker(entry);
-            if (entity instanceof NPCHolder) {
+            if (entity instanceof NPCHolder)
                 return ((NPCHolder) entity).getNPC().data().get(NPC.Metadata.TRACKING_RANGE, (Integer) E.get(entry));
-            }
             return (Integer) E.get(entry);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
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 63b47a1d2..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
@@ -67,9 +67,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
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 aca7241b9..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
@@ -69,7 +69,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 3f4f27768..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
@@ -66,7 +66,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 791252afe..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
@@ -75,7 +75,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -183,11 +183,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 115f950d0..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
@@ -84,7 +84,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -192,11 +192,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 0d30818c2..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
@@ -88,7 +88,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,9 +97,8 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -207,11 +206,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 13095b5ca..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
@@ -78,7 +78,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -106,8 +106,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -192,11 +193,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 d63c51c14..d41a56fd7 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
@@ -72,7 +72,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -91,8 +91,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
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 9f6d44a28..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
@@ -75,7 +75,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -103,8 +103,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -167,9 +168,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean j(double d1, double d2, double d3) {
-            if (npc == null) {
+            if (npc == null)
                 return super.j(d1, d2, d3);
-            }
             return false;
         }
 
@@ -190,11 +190,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 b80602f10..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
@@ -75,7 +75,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -103,8 +103,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -175,17 +176,17 @@ public class EndermiteController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 936b547ed..ddb94f694 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
@@ -100,9 +100,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && trackerEntry == null) {
+        if (npc != null && trackerEntry == null)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -163,12 +162,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -183,16 +177,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                world.removeEntity(EntityHumanNPC.this);
-            }
-        }, 35); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> world.removeEntity(EntityHumanNPC.this), 35); // give enough time for death and smoke animation
     }
 
     @Override
@@ -237,9 +225,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public IChatBaseComponent getPlayerListName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new ChatComponentText("");
-        }
         return super.getPlayerListName();
     }
 
@@ -259,9 +246,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -306,11 +292,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean m_() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.m_();
-        } else {
+        else
             return false;
-        }
     }
 
     private void moveOnCurrentHeading() {
@@ -427,7 +412,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
                 if (cache != null && !cache.isEmpty()) {
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 42ae9bf90..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
@@ -61,7 +61,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,11 +169,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 366776311..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
@@ -52,7 +52,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 245b46ee5..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
@@ -61,7 +61,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -168,11 +169,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8b88b6857..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
@@ -61,7 +61,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +161,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 18d6b9455..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
@@ -61,7 +61,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +161,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 560fc2a72..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
@@ -50,6 +50,7 @@ public class HorseController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -126,9 +127,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean cV() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cV();
         }
 
@@ -213,11 +213,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 0d83e9c51..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
@@ -50,6 +50,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseDonkeyNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -126,9 +127,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean cV() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cV();
         }
 
@@ -213,11 +213,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 49a4cbcf3..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
@@ -50,6 +50,7 @@ public class HorseMuleController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseMuleNPC(World world) {
             this(world, null);
         }
@@ -86,7 +87,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -126,9 +127,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean cV() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cV();
         }
 
@@ -213,11 +213,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 34b065dda..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
@@ -50,6 +50,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseSkeletonNPC(World world) {
             this(world, null);
         }
@@ -87,7 +88,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -127,9 +128,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean cV() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cV();
         }
 
@@ -214,11 +214,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 9684a94bd..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
@@ -50,6 +50,7 @@ public class HorseZombieController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseZombieNPC(World world) {
             this(world, null);
         }
@@ -87,7 +88,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -127,9 +128,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean cV() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cV();
         }
 
@@ -214,11 +214,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 6ed6d9c0f..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_12_R1.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 cf66a01fd..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
@@ -61,7 +61,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -131,8 +131,9 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IllusionerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -168,11 +169,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 f5b122947..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
@@ -61,7 +61,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -168,11 +169,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 4c915984e..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
@@ -51,6 +51,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(World world) {
             this(world, null);
         }
@@ -87,7 +88,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -127,9 +128,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean cV() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cV();
         }
 
@@ -214,11 +214,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 4a58db9b9..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
@@ -67,7 +67,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -103,8 +103,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -181,11 +182,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 d68e26a7c..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
@@ -75,7 +75,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_12_R1.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 fe42e6a62..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
@@ -72,7 +72,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,8 +107,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -179,17 +180,17 @@ public class MushroomCowController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 db48aeee0..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
@@ -70,7 +70,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -185,11 +185,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 ce25fb632..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
@@ -54,16 +54,15 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.a(paramEntityHuman, paramEnumHand);
-            }
             return false;
         }
 
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 3847b4fcf..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
@@ -71,7 +71,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -185,11 +185,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8ab5347c9..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
@@ -61,7 +61,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -168,11 +169,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 91f166502..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
@@ -61,7 +61,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
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 b01aa8f87..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
@@ -71,7 +71,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -187,11 +187,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 be5ad87a4..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
@@ -70,7 +70,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -98,8 +98,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -170,17 +171,17 @@ public class SheepController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 31f334f7b..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
@@ -62,7 +62,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -99,8 +99,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -140,8 +141,9 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -169,11 +171,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 9a09f5bb9..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
@@ -61,7 +61,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,17 +162,17 @@ public class SilverfishController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 332ecd078..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
@@ -61,7 +61,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 2b216ef68..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
@@ -61,7 +61,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new StrayNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 ad032fc52..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
@@ -61,7 +61,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonWitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 1bf0e47e4..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
@@ -67,7 +67,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -152,8 +152,9 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -181,11 +182,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 32031c80e..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
@@ -61,7 +61,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 c3a25b1b9..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
@@ -61,7 +61,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,17 +162,17 @@ public class SpiderController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 a70a5b252..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
@@ -61,7 +61,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class SquidController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -159,11 +161,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 aca19cda6..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
@@ -55,7 +55,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,8 +109,9 @@ public class VexController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VexNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 c835ea3c3..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
@@ -78,7 +78,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,8 +169,9 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -206,11 +207,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 910679c73..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
@@ -70,7 +70,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -140,8 +140,9 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VindicatorNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -177,11 +178,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 4ebad7184..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
@@ -61,7 +61,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class WitchController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,17 +162,17 @@ public class WitchController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 a8ed31d2d..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
@@ -52,7 +52,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -71,8 +71,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -111,8 +112,9 @@ public class WitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 fc6d45660..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
@@ -72,7 +72,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -142,8 +142,9 @@ public class WolfController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -179,11 +180,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 760fdc735..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
@@ -61,7 +61,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 711688bab..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
@@ -61,7 +61,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieHuskNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 d012e38b1..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
@@ -61,7 +61,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -130,8 +131,9 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieVillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +169,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean m_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.m_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 5032b6c36..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
@@ -54,9 +54,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
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 cb2783c99..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.getBlock().a(block, null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
@@ -66,7 +66,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CustomEntityRegistry.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CustomEntityRegistry.java
index a7d2d7962..a35aac2a5 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CustomEntityRegistry.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/CustomEntityRegistry.java
@@ -33,9 +33,8 @@ public class CustomEntityRegistry extends RegistryMaterials
 
     @Override
     public int a(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.a((Class<? extends Entity>) key);
     }
 
@@ -46,9 +45,8 @@ public class CustomEntityRegistry extends RegistryMaterials
 
     @Override
     public MinecraftKey b(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.b((Class<? extends Entity>) value);
     }
 
@@ -64,9 +62,8 @@ public class CustomEntityRegistry extends RegistryMaterials
 
     @Override
     public Class<? extends Entity> get(Object key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get((MinecraftKey) key);
     }
 
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 eb2d85bf2..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
@@ -416,9 +416,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().az();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -456,9 +455,8 @@ public class NMSImpl implements NMSBridge {
             }
         } catch (Exception e) {
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
@@ -489,9 +487,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.b()) {
+        if (controller == null || !controller.b())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -502,9 +499,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aP;
     }
 
@@ -565,7 +561,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Collections.emptyList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -613,8 +609,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -632,23 +628,14 @@ public class NMSImpl implements NMSBridge {
                 Iterables.transform(dest,
                         input -> new PathPoint(input.getBlockX(), input.getBlockY(), input.getBlockZ())),
                 PathPoint.class));
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -743,11 +730,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -899,7 +885,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -909,8 +895,9 @@ public class NMSImpl implements NMSBridge {
             double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff);
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY)) - 90;
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -942,7 +929,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         BAD_CONTROLLER_LOOK.add(EntityType.SHULKER);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -991,8 +978,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(new Location(player.getWorld(), 0, 0, 0),
@@ -1003,8 +988,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.windowId = handle.nextContainerCounter();
@@ -1042,12 +1027,11 @@ public class NMSImpl implements NMSBridge {
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.playerTick();
-            if (!removeFromPlayerList) {
+            if (!removeFromPlayerList)
                 return;
-            }
             Entity entity1 = entity.bJ();
             if (entity1 != null) {
-                if ((entity1.dead) || (!entity1.w(entity))) {
+                if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
             } else {
@@ -1081,8 +1065,9 @@ public class NMSImpl implements NMSBridge {
         Class<?> search = clazz;
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             MinecraftKey key = ENTITY_REGISTRY.b(search);
-            if (key == null)
+            if (key == null) {
                 continue;
+            }
             int code = ENTITY_REGISTRY.a(search);
             ENTITY_REGISTRY.put(code, key, (Class<? extends Entity>) clazz);
             return;
@@ -1418,8 +1403,8 @@ public class NMSImpl implements NMSBridge {
         EntityPlayer from = (EntityPlayer) getHandle(entity);
         PerPlayerMetadata<Long> meta = CitizensAPI.getLocationLookup().registerMetadata("sleeping", null);
         if (sleep) {
-            List<Player> nearbyPlayers = Lists.newArrayList(Iterables
-                    .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> {
+            List<Player> nearbyPlayers = Lists.newArrayList(
+                    Iterables.filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), p -> {
                         Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString());
                         if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000)
                             return true;
@@ -1458,7 +1443,7 @@ public class NMSImpl implements NMSBridge {
             list.add(new PacketPlayOutEntityTeleport(from));
             for (Player nearby : nearbyPlayers) {
                 nearby.sendBlockChange(bedLoc, Material.BED_BLOCK, facingByte);
-                list.forEach((packet) -> sendPacket(nearby, packet));
+                list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
         } else {
@@ -1587,9 +1572,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1662,9 +1646,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_12_R1.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1673,25 +1656,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_12_R1.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_12_R1.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_12_R1.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_12_R1.NBTTagInt) base).e());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_12_R1.NBTTagFloat) base).i());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_12_R1.NBTTagDouble) base).asDouble());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_12_R1.NBTTagLong) base).d());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_12_R1.NBTTagShort) base).f());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_12_R1.NBTTagByte) base).g());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_12_R1.NBTTagByteArray) base).c());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_12_R1.NBTTagIntArray) base).d());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagString)
             return new StringTag(key, base.toString());
-        } else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_12_R1.NBTTagList) {
             List<net.minecraft.server.v1_12_R1.NBTBase> list = (List<net.minecraft.server.v1_12_R1.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1701,18 +1684,16 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(EntityLiving entity, float f, float f1, float f2) {
-        if ((entity.cC()) || (entity.bI())) {
-            if ((entity.isInWater())) {
+        if (entity.cC() || entity.bI()) {
+            if (entity.isInWater()) {
                 double d2 = entity.locY;
                 float f4 = entity instanceof EntityPolarBear ? 0.98F : 0.8F;
                 float f3 = 0.02F;
@@ -1735,8 +1716,8 @@ 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))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
             } else if (entity.au()) {
@@ -1749,8 +1730,8 @@ 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))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
             } else if (entity.cP()) {
@@ -1765,7 +1746,7 @@ public class NMSImpl implements NMSBridge {
                 float f7 = MathHelper.cos(f6);
                 f7 = (float) (f7 * f7 * Math.min(1.0D, d3 / 0.4D));
                 entity.motY += -0.08D + f7 * 0.06D;
-                if ((entity.motY < 0.0D) && (d0 > 0.0D)) {
+                if (entity.motY < 0.0D && d0 > 0.0D) {
                     double d4 = entity.motY * -0.1D * f7;
                     entity.motY += d4;
                     entity.motX += vec3d.x * d4 / d0;
@@ -1785,7 +1766,7 @@ public class NMSImpl implements NMSBridge {
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
-                if ((entity.positionChanged) && (!entity.world.isClientSide)) {
+                if (entity.positionChanged && !entity.world.isClientSide) {
                     double d4 = Math.sqrt(entity.motX * entity.motX + entity.motZ * entity.motZ);
                     double d5 = d1 - d4;
                     float f8 = (float) (d5 * 10.0D - 3.0D);
@@ -1794,8 +1775,8 @@ public class NMSImpl implements NMSBridge {
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f8);
                     }
                 }
-                if ((entity.onGround) && (!entity.world.isClientSide) && (entity.getFlag(7))
-                        && (!CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())) {
+                if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
             } else {
@@ -1825,13 +1806,13 @@ public class NMSImpl implements NMSBridge {
                     if (entity.motY < -0.15D) {
                         entity.motY = -0.15D;
                     }
-                    boolean flag = (entity.isSneaking());
-                    if ((flag) && (entity.motY < 0.0D)) {
+                    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_())) {
+                if (entity.positionChanged && entity.m_()) {
                     entity.motY = 0.2D;
                 }
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -1839,8 +1820,8 @@ public class NMSImpl implements NMSBridge {
                             * 0.2D;
                 } else {
                     blockposition_pooledblockposition.e(entity.locX, 0.0D, entity.locZ);
-                    if ((entity.world.isClientSide) && ((!entity.world.isLoaded(blockposition_pooledblockposition))
-                            || (!entity.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p()))) {
+                    if (entity.world.isClientSide && (!entity.world.isLoaded(blockposition_pooledblockposition)
+                            || !entity.world.getChunkAtWorldCoords(blockposition_pooledblockposition).p())) {
                         if (entity.locY > 0.0D) {
                             entity.motY = -0.1D;
                         } else {
@@ -1859,7 +1840,7 @@ public class NMSImpl implements NMSBridge {
         entity.aF = entity.aG;
         double d2 = entity.locX - entity.lastX;
         double d0 = entity.locZ - entity.lastZ;
-        double d1 = (entity instanceof EntityBird) ? entity.locY - entity.lastY : 0.0D;
+        double d1 = entity instanceof EntityBird ? entity.locY - entity.lastY : 0.0D;
         float f10 = MathHelper.sqrt(d2 * d2 + d1 * d1 + d0 * d0) * 4.0F;
         if (f10 > 1.0F) {
             f10 = 1.0F;
@@ -1951,7 +1932,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -1960,8 +1941,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
@@ -1983,15 +1964,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
-        if ((f != entity.width) || (f1 != entity.length)) {
+        if (f != entity.width || f1 != entity.length) {
             float f2 = entity.width;
             entity.width = f;
             entity.length = f1;
             entity.a(new AxisAlignedBB(entity.getBoundingBox().a, entity.getBoundingBox().b, entity.getBoundingBox().c,
                     entity.getBoundingBox().a + entity.width, entity.getBoundingBox().b + entity.length,
                     entity.getBoundingBox().c + entity.width));
-            if ((entity.width > f2) && (!justCreated) && (!entity.world.isClientSide))
+            if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
+            }
         }
     }
 
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 09c7eac9a..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
@@ -41,7 +41,7 @@ public class PlayerControllerMove extends ControllerMove {
             double d2 = this.c - i;
             double d3 = d0 * d0 + d2 * d2 + d1 * d1;
             if (d3 < 2.500000277905201E-007D) {
-                this.a.bf = (0.0F);
+                this.a.bf = 0.0F;
                 return;
             }
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
@@ -55,7 +55,7 @@ public class PlayerControllerMove extends ControllerMove {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;
                 ((EntityInsentient) this.a).getControllerJump().a();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 if (this.a instanceof EntityHumanNPC) {
                     ((EntityHumanNPC) this.a).getControllerJump().a();
                 } else {
@@ -84,9 +84,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (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 6bb418933..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
@@ -86,16 +86,15 @@ public class PlayerNavigation extends NavigationAbstract {
     @Override
     public boolean a(Entity paramEntity, double paramDouble) {
         PathEntity localPathEntity = a(paramEntity);
-        return (localPathEntity != null) && (a(localPathEntity, paramDouble));
+        return localPathEntity != null && a(localPathEntity, paramDouble);
     }
 
     private boolean a(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6,
             Vec3D paramVec3D, double paramDouble1, double paramDouble2) {
         int j = paramInt1 - paramInt4 / 2;
         int k = paramInt3 - paramInt6 / 2;
-        if (!b(j, paramInt2, k, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2)) {
+        if (!b(j, paramInt2, k, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2))
             return false;
-        }
         for (int m = j; m < j + paramInt4; m++) {
             for (int n = k; n < k + paramInt6; n++) {
                 double d1 = m + 0.5D - paramVec3D.x;
@@ -103,20 +102,17 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                     PathType localPathType = this.h.a(this.b, m, paramInt2 - 1, n, this.a, paramInt4, paramInt5,
                             paramInt6, true, true);
-                    if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA)
-                            || (localPathType == PathType.OPEN)) {
+                    if (localPathType == PathType.WATER || localPathType == PathType.LAVA
+                            || localPathType == PathType.OPEN)
                         return false;
-                    }
                     localPathType = this.h.a(this.b, m, paramInt2, n, this.a, paramInt4, paramInt5, paramInt6, true,
                             true);
                     float f = this.a.a(localPathType);
-                    if ((f < 0.0F) || (f >= 8.0F)) {
+                    if (f < 0.0F || f >= 8.0F)
                         return false;
-                    }
-                    if ((localPathType == PathType.DAMAGE_FIRE) || (localPathType == PathType.DANGER_FIRE)
-                            || (localPathType == PathType.DAMAGE_OTHER)) {
+                    if (localPathType == PathType.DAMAGE_FIRE || localPathType == PathType.DANGER_FIRE
+                            || localPathType == PathType.DAMAGE_OTHER)
                         return false;
-                    }
                 }
             }
         }
@@ -133,9 +129,8 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = paramPathEntity;
         }
         q_();
-        if (this.c.d() <= 0) {
+        if (this.c.d() <= 0)
             return false;
-        }
         this.d = paramDouble;
         Vec3D localVec3D = c();
         this.j = this.e;
@@ -152,16 +147,16 @@ public class PlayerNavigation extends NavigationAbstract {
             this.j = this.e;
             this.k = paramVec3D;
         }
-        if ((this.c != null) && (!this.c.b())) {
+        if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (localVec3D.equals(this.l)) {
                 this.m += System.currentTimeMillis() - this.n;
             } else {
                 this.l = localVec3D;
                 double d1 = paramVec3D.f(this.l);
-                this.o = (this.a.cy() > 0.0F ? d1 / this.a.cy() * 1000.0D : 0.0D);
+                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)) {
+            if (this.o > 0.0D && this.m > this.o * 3.0D) {
                 this.l = Vec3D.a;
                 this.m = 0L;
                 this.o = 0.0D;
@@ -178,17 +173,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double d1 = paramVec3D2.x - paramVec3D1.x;
         double d2 = paramVec3D2.z - paramVec3D1.z;
         double d3 = d1 * d1 + d2 * d2;
-        if (d3 < 1.0E-8D) {
+        if (d3 < 1.0E-8D)
             return false;
-        }
         double d4 = 1.0D / Math.sqrt(d3);
         d1 *= d4;
         d2 *= d4;
         paramInt1 += 2;
         paramInt3 += 2;
-        if (!a(j, (int) paramVec3D1.y, k, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+        if (!a(j, (int) paramVec3D1.y, k, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
             return false;
-        }
         paramInt1 -= 2;
         paramInt3 -= 2;
         double d5 = 1.0D / Math.abs(d1);
@@ -209,7 +202,7 @@ public class PlayerNavigation extends NavigationAbstract {
         int i2 = MathHelper.floor(paramVec3D2.z);
         int i3 = i1 - j;
         int i4 = i2 - k;
-        while ((i3 * m > 0) || (i4 * n > 0)) {
+        while (i3 * m > 0 || i4 * n > 0) {
             if (d7 < d8) {
                 d7 += d5;
                 j += m;
@@ -219,16 +212,15 @@ public class PlayerNavigation extends NavigationAbstract {
                 k += n;
                 i4 = i2 - k;
             }
-            if (!a(j, (int) paramVec3D1.y, k, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+            if (!a(j, (int) paramVec3D1.y, k, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
-            }
         }
         return true;
     }
 
     @Override
     protected boolean b() {
-        return (this.a.onGround) || ((h()) && (q())) || (this.a.isPassenger());
+        return this.a.onGround || h() && q() || this.a.isPassenger();
     }
 
     @Override
@@ -236,23 +228,21 @@ public class PlayerNavigation extends NavigationAbstract {
         BlockPosition localBlockPosition;
         if (this.b.getType(paramBlockPosition).getMaterial() == Material.AIR) {
             localBlockPosition = paramBlockPosition.down();
-            while ((localBlockPosition.getY() > 0)
-                    && (this.b.getType(localBlockPosition).getMaterial() == Material.AIR)) {
+            while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).getMaterial() == Material.AIR) {
                 localBlockPosition = localBlockPosition.down();
             }
-            if (localBlockPosition.getY() > 0) {
+            if (localBlockPosition.getY() > 0)
                 return b2(localBlockPosition.up());
-            }
-            while ((localBlockPosition.getY() < this.b.getHeight())
-                    && (this.b.getType(localBlockPosition).getMaterial() == Material.AIR)) {
+            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())) {
+            while (localBlockPosition.getY() < this.b.getHeight()
+                    && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
             return b2(localBlockPosition);
@@ -272,21 +262,18 @@ public class PlayerNavigation extends NavigationAbstract {
             double d2 = localBlockPosition.getZ() + 0.5D - paramVec3D.z;
             if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                 Block localBlock = this.b.getType(localBlockPosition).getBlock();
-                if (!localBlock.b(this.b, localBlockPosition)) {
+                if (!localBlock.b(this.b, localBlockPosition))
                     return false;
-                }
             }
         }
         return true;
     }
 
     private PathEntity b2(BlockPosition paramBlockPosition) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
-        if ((this.c != null) && (!this.c.b()) && (paramBlockPosition.equals(this.q))) {
+        if (this.c != null && !this.c.b() && paramBlockPosition.equals(this.q))
             return this.c;
-        }
         this.q = paramBlockPosition;
         float f1 = i();
         this.b.methodProfiler.a("pathfind");
@@ -314,24 +301,22 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.g) {
             k();
         }
-        if (o()) {
+        if (o())
             return;
-        }
         if (b()) {
             n();
-        } else if ((this.c != null) && (this.c.e() < this.c.d())) {
+        } else if (this.c != null && this.c.e() < this.c.d()) {
             Vec3D localVec3D = c();
             Vec3D localObject = this.c.a(this.a, this.c.e());
-            if ((localVec3D.y > localObject.y) && (!this.a.onGround)
-                    && (MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x))
-                    && (MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z))) {
+            if (localVec3D.y > localObject.y && !this.a.onGround
+                    && MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x)
+                    && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
         }
         m();
-        if (o()) {
+        if (o())
             return;
-        }
         Vec3D localVec3D = this.c.a(this.a);
         Object localObject = new BlockPosition(localVec3D).down();
         AxisAlignedBB localAxisAlignedBB = this.b.getType((BlockPosition) localObject).e(this.b,
@@ -395,11 +380,11 @@ public class PlayerNavigation extends NavigationAbstract {
                 break;
             }
         }
-        this.f = (this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F);
+        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)
-                && (MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.f)
-                && (Math.abs(this.a.locY - localVec3D2.y) < 1.0D)) {
+        if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.f
+                && MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.f
+                && Math.abs(this.a.locY - localVec3D2.y) < 1.0D) {
             this.c.c(this.c.e() + 1);
         }
         int i3 = MathHelper.f(this.a.width);
@@ -416,7 +401,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public boolean o() {
-        return (this.c == null) || (this.c.b());
+        return this.c == null || this.c.b();
     }
 
     @Override
@@ -426,7 +411,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean q() {
-        return (this.a.isInWater()) || (this.a.au());
+        return this.a.isInWater() || this.a.au();
     }
 
     @Override
@@ -434,9 +419,8 @@ public class PlayerNavigation extends NavigationAbstract {
         super.q_();
         if (this.ii) {
             if (this.b.h(new BlockPosition(MathHelper.floor(this.a.locX), (int) (this.a.getBoundingBox().b + 0.5D),
-                    MathHelper.floor(this.a.locZ)))) {
+                    MathHelper.floor(this.a.locZ))))
                 return;
-            }
             for (int j = 0; j < this.c.d(); j++) {
                 PathPoint localPathPoint = this.c.a(j);
                 if (this.b.h(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c))) {
@@ -453,22 +437,20 @@ public class PlayerNavigation extends NavigationAbstract {
     }
 
     private int s() {
-        if ((!this.a.isInWater()) || (!h())) {
+        if (!this.a.isInWater() || !h())
             return (int) (this.a.getBoundingBox().b + 0.5D);
-        }
         int j = (int) this.a.getBoundingBox().b;
         Block localBlock = this.b
                 .getType(new BlockPosition(MathHelper.floor(this.a.locX), j, MathHelper.floor(this.a.locZ))).getBlock();
         int k = 0;
-        while ((localBlock == Blocks.FLOWING_WATER) || (localBlock == Blocks.WATER)) {
+        while (localBlock == Blocks.FLOWING_WATER || localBlock == Blocks.WATER) {
             j++;
             localBlock = this.b
                     .getType(new BlockPosition(MathHelper.floor(this.a.locX), j, MathHelper.floor(this.a.locZ)))
                     .getBlock();
             k++;
-            if (k > 16) {
+            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 293b3ea8c..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
@@ -56,10 +56,10 @@ public class PlayerPathfinder extends Pathfinder {
         }
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
-        arrayOfPathPoint[(--i)] = localPathPoint;
+        arrayOfPathPoint[--i] = localPathPoint;
         while (localPathPoint.h != null) {
             localPathPoint = localPathPoint.h;
-            arrayOfPathPoint[(--i)] = localPathPoint;
+            arrayOfPathPoint[--i] = localPathPoint;
         }
         return new PathEntity(arrayOfPathPoint);
     }
@@ -91,25 +91,24 @@ public class PlayerPathfinder extends Pathfinder {
             for (int k = 0; k < j; k++) {
                 PathPoint localPathPoint = this.c[k];
                 float f1 = localObject2.c(localPathPoint);
-                localPathPoint.j = (localObject2.j + f1);
-                localPathPoint.k = (f1 + localPathPoint.l);
+                localPathPoint.j = localObject2.j + f1;
+                localPathPoint.k = f1 + localPathPoint.l;
                 float f2 = localObject2.e + localPathPoint.k;
-                if ((localPathPoint.j < paramFloat) && ((!localPathPoint.a()) || (f2 < localPathPoint.e))) {
-                    localPathPoint.h = (localObject2);
+                if (localPathPoint.j < paramFloat && (!localPathPoint.a() || f2 < localPathPoint.e)) {
+                    localPathPoint.h = localObject2;
                     localPathPoint.e = f2;
-                    localPathPoint.f = (localPathPoint.c(paramPathPoint2) + localPathPoint.l);
+                    localPathPoint.f = localPathPoint.c(paramPathPoint2) + localPathPoint.l;
                     if (localPathPoint.a()) {
                         this.a.a(localPathPoint, localPathPoint.e + localPathPoint.f);
                     } else {
-                        localPathPoint.g = (localPathPoint.e + localPathPoint.f);
+                        localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
                 }
             }
         }
-        if (localObject1 == paramPathPoint1) {
+        if (localObject1 == paramPathPoint1)
             return null;
-        }
         Object localObject2 = pa(paramPathPoint1, (PathPoint) localObject1);
         return (PathEntity) localObject2;
     }
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 0efcb0c3e..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
@@ -10,7 +10,7 @@ import net.minecraft.server.v1_12_R1.PathfinderAbstract;
 public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
     protected IBlockAccess a;
     protected EntityHumanNPC b;
-    protected final IntHashMap<PathPoint> c = new IntHashMap<PathPoint>();
+    protected final IntHashMap<PathPoint> c = new IntHashMap<>();
     protected int d;
     protected int e;
     protected int f;
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 3ab7dda1c..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
@@ -49,14 +49,14 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     @Override
     public PathType a(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) {
         PathType localPathType1 = pb(paramIBlockAccess, paramInt1, paramInt2, paramInt3);
-        if ((localPathType1 == PathType.OPEN) && (paramInt2 >= 1)) {
+        if (localPathType1 == PathType.OPEN && paramInt2 >= 1) {
             Block localBlock = paramIBlockAccess.getType(new BlockPosition(paramInt1, paramInt2 - 1, paramInt3))
                     .getBlock();
             PathType localPathType2 = pb(paramIBlockAccess, paramInt1, paramInt2 - 1, paramInt3);
-            localPathType1 = (localPathType2 == PathType.WALKABLE) || (localPathType2 == PathType.OPEN)
-                    || (localPathType2 == PathType.WATER) || (localPathType2 == PathType.LAVA) ? PathType.OPEN
+            localPathType1 = localPathType2 == PathType.WALKABLE || localPathType2 == PathType.OPEN
+                    || localPathType2 == PathType.WATER || localPathType2 == PathType.LAVA ? PathType.OPEN
                             : PathType.WALKABLE;
-            if ((localPathType2 == PathType.DAMAGE_FIRE) || (localBlock == Blocks.df)) {
+            if (localPathType2 == PathType.DAMAGE_FIRE || localBlock == Blocks.df) {
                 localPathType1 = PathType.DAMAGE_FIRE;
             }
             if (localPathType2 == PathType.DAMAGE_CACTUS) {
@@ -75,21 +75,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         BlockPosition localBlockPosition = new BlockPosition(paramEntityInsentient);
         localPathType1 = a(paramIBlockAccess, paramInt1, paramInt2, paramInt3, paramInt4, paramInt5, paramInt6,
                 paramBoolean1, paramBoolean2, localEnumSet, localPathType1, localBlockPosition);
-        if (localEnumSet.contains(PathType.FENCE)) {
+        if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
-        }
         Object localObject = PathType.BLOCKED;
         for (PathType localPathType2 : localEnumSet) {
-            if (paramEntityInsentient.a(localPathType2) < 0.0F) {
+            if (paramEntityInsentient.a(localPathType2) < 0.0F)
                 return localPathType2;
-            }
             if (paramEntityInsentient.a(localPathType2) >= paramEntityInsentient.a((PathType) localObject)) {
                 localObject = localPathType2;
             }
         }
-        if ((localPathType1 == PathType.OPEN) && (paramEntityInsentient.a((PathType) localObject) == 0.0F)) {
+        if (localPathType1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject) == 0.0F)
             return PathType.OPEN;
-        }
         return (PathType) localObject;
     }
 
@@ -102,21 +99,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         BlockPosition localBlockPosition = new BlockPosition(paramEntityInsentient);
         localPathType1 = a(paramIBlockAccess, paramInt1, paramInt2, paramInt3, paramInt4, paramInt5, paramInt6,
                 paramBoolean1, paramBoolean2, localEnumSet, localPathType1, localBlockPosition);
-        if (localEnumSet.contains(PathType.FENCE)) {
+        if (localEnumSet.contains(PathType.FENCE))
             return PathType.FENCE;
-        }
         Object localObject = PathType.BLOCKED;
         for (PathType localPathType2 : localEnumSet) {
-            if (paramEntityInsentient.a(localPathType2) < 0.0F) {
+            if (paramEntityInsentient.a(localPathType2) < 0.0F)
                 return localPathType2;
-            }
             if (paramEntityInsentient.a(localPathType2) >= paramEntityInsentient.a((PathType) localObject)) {
                 localObject = localPathType2;
             }
         }
-        if ((localPathType1 == PathType.OPEN) && (paramEntityInsentient.a((PathType) localObject) == 0.0F)) {
+        if (localPathType1 == PathType.OPEN && paramEntityInsentient.a((PathType) localObject) == 0.0F)
             return PathType.OPEN;
-        }
         return (PathType) localObject;
     }
 
@@ -130,20 +124,20 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     int i1 = k + paramInt2;
                     int i2 = m + paramInt3;
                     PathType localPathType = a(paramIBlockAccess, n, i1, i2);
-                    if ((localPathType == PathType.DOOR_WOOD_CLOSED) && (paramBoolean1) && (paramBoolean2)) {
+                    if (localPathType == PathType.DOOR_WOOD_CLOSED && paramBoolean1 && paramBoolean2) {
                         localPathType = PathType.WALKABLE;
                     }
-                    if ((localPathType == PathType.DOOR_OPEN) && (!paramBoolean2)) {
+                    if (localPathType == PathType.DOOR_OPEN && !paramBoolean2) {
                         localPathType = PathType.BLOCKED;
                     }
-                    if ((localPathType == PathType.RAIL)
-                            && (!(paramIBlockAccess.getType(paramBlockPosition)
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))
-                            && (!(paramIBlockAccess.getType(paramBlockPosition.down())
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))) {
+                    if (localPathType == PathType.RAIL
+                            && !(paramIBlockAccess.getType(paramBlockPosition)
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)
+                            && !(paramIBlockAccess.getType(paramBlockPosition.down())
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)) {
                         localPathType = PathType.FENCE;
                     }
-                    if ((i == 0) && (k == 0) && (m == 0)) {
+                    if (i == 0 && k == 0 && m == 0) {
                         paramPathType = localPathType;
                     }
                     paramEnumSet.add(localPathType);
@@ -159,7 +153,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         if (paramPathType == PathType.WALKABLE) {
             for (int i = -1; i <= 1; i++) {
                 for (int k = -1; k <= 1; k++) {
-                    if ((i != 0) || (k != 0)) {
+                    if (i != 0 || k != 0) {
                         Block localBlock = paramIBlockAccess
                                 .getType(localPooledBlockPosition.f(i + paramInt1, paramInt2, k + paramInt3))
                                 .getBlock();
@@ -196,57 +190,49 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 EnumDirection.EAST);
         PathPoint localPathPoint4 = pa(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
                 EnumDirection.NORTH);
-        if ((localPathPoint1 != null) && (!localPathPoint1.i) && (localPathPoint1.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint1;
+        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 (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[i++] = localPathPoint2;
         }
-        if ((localPathPoint3 != null) && (!localPathPoint3.i) && (localPathPoint3.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint3;
+        if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[i++] = localPathPoint3;
         }
-        if ((localPathPoint4 != null) && (!localPathPoint4.i) && (localPathPoint4.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(i++)] = localPathPoint4;
+        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;
-        int i2 = (localPathPoint2 == null) || (localPathPoint2.m == PathType.OPEN) || (localPathPoint2.l != 0.0F) ? 1
-                : 0;
+        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;
+        int i2 = localPathPoint2 == null || localPathPoint2.m == PathType.OPEN || localPathPoint2.l != 0.0F ? 1 : 0;
         PathPoint localPathPoint5;
-        if ((m != 0) && (i2 != 0)) {
+        if (m != 0 && i2 != 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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((m != 0) && (i1 != 0)) {
+        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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((n != 0) && (i2 != 0)) {
+        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 (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
-        if ((n != 0) && (i1 != 0)) {
+        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;
+            if (localPathPoint5 != null && !localPathPoint5.i && localPathPoint5.a(paramPathPoint2) < paramFloat) {
+                paramArrayOfPathPoint[i++] = localPathPoint5;
             }
         }
         return i;
@@ -256,12 +242,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     public PathPoint b() {
         int i;
         BlockPosition localObject1;
-        if ((e()) && (this.b.isInWater())) {
+        if (e() && this.b.isInWater()) {
             i = (int) this.b.getBoundingBox().b;
             localObject1 = new BlockPosition.MutableBlockPosition(MathHelper.floor(this.b.locX), i,
                     MathHelper.floor(this.b.locZ));
             Block localObject2 = this.a.getType(localObject1).getBlock();
-            while ((localObject2 == Blocks.FLOWING_WATER) || (localObject2 == Blocks.WATER)) {
+            while (localObject2 == Blocks.FLOWING_WATER || localObject2 == Blocks.WATER) {
                 i++;
                 ((MutableBlockPosition) localObject1).c(MathHelper.floor(this.b.locX), i,
                         MathHelper.floor(this.b.locZ));
@@ -271,9 +257,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             i = MathHelper.floor(this.b.getBoundingBox().b + 0.5D);
         } else {
             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)) {
+            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();
@@ -288,9 +273,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().f));
             for (BlockPosition localBlockPosition : localHashSet) {
                 PathType localPathType = pa(this.b, localBlockPosition);
-                if (this.b.a(localPathType) >= 0.0F) {
+                if (this.b.a(localPathType) >= 0.0F)
                     return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
-                }
             }
         }
         return a(localObject1.getX(), i, localObject1.getZ());
@@ -311,9 +295,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         BlockPosition localBlockPosition1 = new BlockPosition(paramInt1, paramInt2, paramInt3);
         BlockPosition localBlockPosition2 = localBlockPosition1.down();
         double d1 = paramInt2 - (1.0D - this.a.getType(localBlockPosition2).e(this.a, localBlockPosition2).e);
-        if (d1 - paramDouble > 1.125D) {
+        if (d1 - paramDouble > 1.125D)
             return null;
-        }
         PathType localPathType1 = pa(this.b, paramInt1, paramInt2, paramInt3);
         float f = this.b.a(localPathType1);
         double d2 = this.b.width / 2.0D;
@@ -322,15 +305,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             localPathPoint.m = localPathType1;
             localPathPoint.l = Math.max(localPathPoint.l, f);
         }
-        if (localPathType1 == PathType.WALKABLE) {
+        if (localPathType1 == PathType.WALKABLE)
             return localPathPoint;
-        }
-        if ((localPathPoint == null) && (paramInt4 > 0) && (localPathType1 != PathType.FENCE)
-                && (localPathType1 != PathType.TRAPDOOR)) {
+        if (localPathPoint == null && paramInt4 > 0 && localPathType1 != PathType.FENCE
+                && localPathType1 != PathType.TRAPDOOR) {
             localPathPoint = pa(paramInt1, paramInt2 + 1, paramInt3, paramInt4 - 1, paramDouble, paramEnumDirection);
-            if ((localPathPoint != null)
-                    && ((localPathPoint.m == PathType.OPEN) || (localPathPoint.m == PathType.WALKABLE))
-                    && (this.b.width < 1.0F)) {
+            if (localPathPoint != null && (localPathPoint.m == PathType.OPEN || localPathPoint.m == PathType.WALKABLE)
+                    && this.b.width < 1.0F) {
                 double d3 = paramInt1 - paramEnumDirection.getAdjacentX() + 0.5D;
                 double d4 = paramInt3 - paramEnumDirection.getAdjacentZ() + 0.5D;
                 AxisAlignedBB localAxisAlignedBB1 = new AxisAlignedBB(d3 - d2, paramInt2 + 0.001D, d4 - d2, d3 + d2,
@@ -345,9 +326,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         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);
-            if (this.b.world.a(localAxisAlignedBB4)) {
+            if (this.b.world.a(localAxisAlignedBB4))
                 return null;
-            }
             if (this.b.width >= 1.0F) {
                 PathType localPathType2 = pa(this.b, paramInt1, paramInt2 - 1, paramInt3);
                 if (localPathType2 == PathType.BLOCKED) {
@@ -358,20 +338,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 }
             }
             int i = 0;
-            while ((paramInt2 > 0) && (localPathType1 == PathType.OPEN)) {
+            while (paramInt2 > 0 && localPathType1 == PathType.OPEN) {
                 paramInt2--;
-                if (i++ >= b.bg()) {
+                if (i++ >= b.bg())
                     return null;
-                }
                 localPathType1 = pa(this.b, paramInt1, paramInt2, paramInt3);
                 f = this.b.a(localPathType1);
-                if ((localPathType1 != PathType.OPEN) && (f >= 0.0F)) {
+                if (localPathType1 != PathType.OPEN && f >= 0.0F) {
                     localPathPoint = a(paramInt1, paramInt2, paramInt3);
                     localPathPoint.m = localPathType1;
                     localPathPoint.l = Math.max(localPathPoint.l, f);
-                } else if (f < 0.0F) {
+                } else if (f < 0.0F)
                     return null;
-                }
             }
         }
         return localPathPoint;
@@ -382,47 +360,33 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         IBlockData localIBlockData = paramIBlockAccess.getType(localBlockPosition);
         Block localBlock = localIBlockData.getBlock();
         Material localMaterial = localIBlockData.getMaterial();
-        if (localMaterial == Material.AIR) {
+        if (localMaterial == Material.AIR)
             return PathType.OPEN;
-        }
-        if ((localBlock == Blocks.TRAPDOOR) || (localBlock == Blocks.IRON_TRAPDOOR)
-                || (localBlock == Blocks.WATERLILY)) {
+        if (localBlock == Blocks.TRAPDOOR || localBlock == Blocks.IRON_TRAPDOOR || localBlock == Blocks.WATERLILY)
             return PathType.TRAPDOOR;
-        }
-        if (localBlock == Blocks.FIRE) {
+        if (localBlock == Blocks.FIRE)
             return PathType.DAMAGE_FIRE;
-        }
-        if (localBlock == Blocks.CACTUS) {
+        if (localBlock == Blocks.CACTUS)
             return PathType.DAMAGE_CACTUS;
-        }
-        if (((localBlock instanceof BlockDoor)) && (localMaterial == Material.WOOD)
-                && (!localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock instanceof BlockDoor && localMaterial == Material.WOOD
+                && !localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_WOOD_CLOSED;
-        }
-        if (((localBlock instanceof BlockDoor)) && (localMaterial == Material.ORE)
-                && (!localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock instanceof BlockDoor && localMaterial == Material.ORE
+                && !localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_IRON_CLOSED;
-        }
-        if (((localBlock instanceof BlockDoor)) && (localIBlockData.get(BlockDoor.OPEN).booleanValue())) {
+        if (localBlock instanceof BlockDoor && localIBlockData.get(BlockDoor.OPEN).booleanValue())
             return PathType.DOOR_OPEN;
-        }
-        if ((localBlock instanceof BlockMinecartTrackAbstract)) {
+        if (localBlock instanceof BlockMinecartTrackAbstract)
             return PathType.RAIL;
-        }
-        if (((localBlock instanceof BlockFence)) || ((localBlock instanceof BlockCobbleWall))
-                || (((localBlock instanceof BlockFenceGate))
-                        && (!localIBlockData.get(BlockFenceGate.OPEN).booleanValue()))) {
+        if (localBlock instanceof BlockFence || localBlock instanceof BlockCobbleWall
+                || localBlock instanceof BlockFenceGate && !localIBlockData.get(BlockFenceGate.OPEN).booleanValue())
             return PathType.FENCE;
-        }
-        if (localMaterial == Material.WATER) {
+        if (localMaterial == Material.WATER)
             return PathType.WATER;
-        }
-        if (localMaterial == Material.LAVA) {
+        if (localMaterial == Material.LAVA)
             return PathType.LAVA;
-        }
-        if (localBlock.b(paramIBlockAccess, localBlockPosition)) {
+        if (localBlock.b(paramIBlockAccess, localBlockPosition))
             return PathType.OPEN;
-        }
         return PathType.BLOCKED;
     }
 }
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 a284cf60c..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
@@ -69,9 +69,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -80,9 +79,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 fe38a1d18..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
@@ -73,15 +73,14 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -184,9 +183,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 71e396b45..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
@@ -70,15 +70,14 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -178,9 +177,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 9cb029c0a..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
@@ -79,7 +79,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -204,9 +203,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -221,11 +219,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 7fceb012a..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
@@ -90,7 +90,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -105,9 +105,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -231,19 +230,17 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
 
         private static final Method MOVEMENT_TICK = NMS.getMethod(EntityChicken.class, "k", false);
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 fe28a2486..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
@@ -87,7 +87,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -96,9 +96,8 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -115,9 +114,8 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -152,8 +150,9 @@ public class CodController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -186,8 +185,9 @@ public class CodController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CodNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -238,19 +238,17 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 457bc217d..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
@@ -92,7 +92,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -101,9 +101,8 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -118,9 +117,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -228,19 +226,17 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 cacee7cf1..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
@@ -82,7 +82,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,9 +97,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -134,8 +133,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -213,9 +213,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -241,11 +240,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 f132ac300..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
@@ -87,7 +87,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,9 +109,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -146,8 +145,9 @@ public class DolphinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -180,8 +180,9 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DolphinNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -209,9 +210,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -229,11 +229,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 b45c31ead..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
@@ -79,7 +79,7 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -131,8 +130,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -165,8 +165,9 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new DrownedNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -202,19 +203,17 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 ed5f6e66d..dc3641a79 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
@@ -77,15 +77,14 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -113,8 +112,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -277,9 +277,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 5c46a4ee5..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
@@ -79,7 +79,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -131,8 +130,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -195,9 +195,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean j(double d1, double d2, double d3) {
-            if (npc == null) {
+            if (npc == null)
                 return super.j(d1, d2, d3);
-            }
             return false;
         }
 
@@ -211,9 +210,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -228,11 +226,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 958917cf2..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
@@ -79,7 +79,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -131,8 +130,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -196,15 +196,15 @@ public class EndermiteController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -219,11 +219,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 }
\ No newline at end of file
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 c559114bb..68847453c 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
@@ -101,9 +101,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && trackerEntry == null) {
+        if (npc != null && trackerEntry == null)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -159,12 +158,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -179,16 +173,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                world.removeEntity(EntityHumanNPC.this);
-            }
-        }, 35); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) () -> world.removeEntity(EntityHumanNPC.this), 35); // give enough time for death and smoke animation
     }
 
     @Override
@@ -226,9 +214,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public IChatBaseComponent getPlayerListName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new ChatComponentText("");
-        }
         return super.getPlayerListName();
     }
 
@@ -248,9 +235,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -418,7 +404,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
                 if (cache != null && !cache.isEmpty()) {
@@ -448,11 +434,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean z_() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.z_();
-        } else {
+        else
             return false;
-        }
     }
 
     public static class PlayerNPC extends CraftPlayer implements NPCHolder, SkinnableEntity {
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 1b691f7f6..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
@@ -65,7 +65,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -190,19 +189,17 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 13f52aadd..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
@@ -56,15 +56,14 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -170,9 +169,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 00774e7c1..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
@@ -65,7 +65,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -189,9 +189,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -206,11 +205,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 d01803a21..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
@@ -67,7 +67,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -82,9 +82,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -202,9 +201,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -219,11 +217,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
 
         private static final Method MOVEMENT_TICK = NMS.getMethod(EntityGuardian.class, "k", false);
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 515272963..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
@@ -67,7 +67,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -82,9 +82,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -202,9 +201,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -219,11 +217,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
 
         private static final Method MOVEMENT_TICK = NMS.getMethod(EntityGuardianElder.class, "k", false);
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 bf88682eb..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
@@ -92,7 +92,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,9 +107,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -129,9 +128,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean bT() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.bT();
         }
 
@@ -236,19 +234,17 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 3b8b70735..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
@@ -92,7 +92,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,9 +107,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -129,9 +128,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean bT() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.bT();
         }
 
@@ -236,19 +234,17 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 5ba06b5ad..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
@@ -92,7 +92,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,9 +107,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -129,9 +128,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean bT() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.bT();
         }
 
@@ -236,19 +234,17 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 a42ec307d..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
@@ -55,6 +55,7 @@ public class HorseSkeletonController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseSkeletonNPC(World world) {
             this(world, null);
         }
@@ -92,7 +93,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,9 +108,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -129,9 +129,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean bT() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.bT();
         }
 
@@ -236,19 +235,17 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 3738979d7..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
@@ -93,7 +93,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -108,9 +108,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -130,9 +129,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean bT() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.bT();
         }
 
@@ -237,19 +235,17 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 1d579db3e..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_13_R2.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 5549138a1..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
@@ -65,7 +65,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -152,8 +151,9 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IllusionerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -189,19 +189,17 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 6b1d0ee33..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
@@ -65,7 +65,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -189,9 +189,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -206,11 +205,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 e1a6d67a5..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
@@ -55,6 +55,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(World world) {
             this(world, null);
         }
@@ -91,7 +92,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -106,9 +107,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -128,9 +128,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean bT() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.bT();
         }
 
@@ -235,19 +234,17 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 0c1dae9bd..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
@@ -71,7 +71,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -86,9 +86,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -123,8 +122,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -194,9 +194,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -219,11 +218,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 d9dc1801e..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
@@ -75,7 +75,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_13_R2.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 17796a998..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
@@ -76,7 +76,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -98,9 +98,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -135,8 +134,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -200,25 +200,24 @@ public class MushroomCowController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 0fd44c118..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
@@ -74,7 +74,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,9 +89,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -206,19 +205,17 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 f0ee57b61..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
@@ -58,24 +58,22 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.a(paramEntityHuman, paramEnumHand);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -178,9 +176,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 64518a71e..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
@@ -76,7 +76,7 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -91,9 +91,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -128,8 +127,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -169,8 +169,9 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PhantomNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -217,9 +218,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -238,11 +238,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
 
         private static final Method MOVEMENT_TICK = NMS.getMethod(EntityPhantom.class, "k", false);
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 b9168846a..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
@@ -75,7 +75,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -206,9 +205,8 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -221,11 +219,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 e979f8d65..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
@@ -65,7 +65,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -189,19 +189,17 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 688ba2459..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
@@ -65,15 +65,14 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -174,9 +173,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 e3ee2ed4c..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
@@ -74,7 +74,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -83,9 +83,8 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -102,9 +101,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -174,8 +172,9 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PufferFishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -226,19 +225,17 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 c48e0c5c5..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
@@ -75,7 +75,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -210,9 +209,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -229,11 +227,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 0bb300f95..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
@@ -73,7 +73,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -82,9 +82,8 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -101,9 +100,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -138,8 +136,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -172,8 +171,9 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SalmonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -224,19 +224,17 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 5eb06fe1b..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
@@ -74,7 +74,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,9 +89,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -126,8 +125,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -191,25 +191,24 @@ public class SheepController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 33647cce4..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
@@ -68,7 +68,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -83,9 +83,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -120,8 +119,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -154,8 +154,9 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ShulkerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -198,9 +199,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -229,11 +229,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
 
         private static final Method MOVEMENT_TICK = NMS.getMethod(EntityShulker.class, "k", false);
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 7f6de1727..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
@@ -65,7 +65,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -181,15 +182,15 @@ public class SilverfishController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -204,11 +205,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 0f1b54d0b..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
@@ -65,7 +65,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,9 +189,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -205,11 +205,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 2208b07d1..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
@@ -65,7 +65,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new StrayNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,9 +189,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -205,11 +205,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 ff39b42aa..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
@@ -65,7 +65,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonWitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,9 +189,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -205,11 +205,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 18d839239..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
@@ -71,7 +71,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -86,9 +86,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -165,8 +164,9 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -194,9 +194,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -219,11 +218,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 359c0ab65..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
@@ -65,7 +65,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,9 +189,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -205,11 +205,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 b433eb07c..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
@@ -65,7 +65,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -181,15 +182,15 @@ public class SpiderController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -204,11 +205,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 70cedb7ba..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
@@ -65,7 +65,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class SquidController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,9 +189,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -205,11 +205,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 11d2c3e40..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
@@ -73,7 +73,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -82,9 +82,8 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -101,9 +100,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -138,8 +136,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -172,8 +171,9 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TropicalFishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -224,19 +224,17 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 618cbeb5d..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
@@ -72,7 +72,7 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,9 +89,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -126,8 +125,9 @@ public class TurtleController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -160,8 +160,9 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new TurtleNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -197,19 +198,17 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
 
         static class EmptyControllerJump extends ControllerJump {
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 1b1a9e27a..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
@@ -59,15 +59,14 @@ public class VexController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -130,8 +129,9 @@ public class VexController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VexNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,9 +167,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 6864c9a04..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
@@ -82,7 +82,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,9 +109,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -190,8 +189,9 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -227,9 +227,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -242,11 +241,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 2569e6cb6..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
@@ -74,7 +74,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,9 +89,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -161,8 +160,9 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VindicatorNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -198,19 +198,17 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 63021967d..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
@@ -65,7 +65,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class WitchController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -181,15 +182,15 @@ public class WitchController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -204,11 +205,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 f5b5a0d17..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
@@ -56,15 +56,14 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -92,8 +91,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -132,8 +132,9 @@ public class WitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitherNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -175,9 +176,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 05ce0cecb..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
@@ -76,7 +76,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -91,9 +91,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -163,8 +162,9 @@ public class WolfController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -200,9 +200,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
@@ -213,11 +212,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 9267d5cad..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
@@ -65,7 +65,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,19 +189,17 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 6460cf857..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
@@ -65,7 +65,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieHuskNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,19 +189,17 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 181573426..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
@@ -65,7 +65,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
@@ -117,8 +116,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -151,8 +151,9 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieVillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -188,19 +189,17 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
         @Override
         public boolean z_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.z_();
-            } else {
+            else
                 return false;
-            }
         }
     }
 
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 103e3e532..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
@@ -64,9 +64,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 d05be70dd..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
@@ -65,9 +65,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 8cd7155ef..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
@@ -65,9 +65,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 00d9e2a1e..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
@@ -80,9 +80,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 d6e991a4f..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
@@ -64,9 +64,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 3ba16a511..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
@@ -64,9 +64,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 e433bf154..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
@@ -64,9 +64,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 3df604af9..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
@@ -56,9 +56,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -67,9 +66,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 45e172d78..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
@@ -50,9 +50,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 9d46f06af..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
@@ -73,9 +73,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 818947ec2..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
@@ -50,9 +50,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 584873d85..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
@@ -59,9 +59,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 b31ef9cce..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
@@ -63,9 +63,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 796c5d451..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
@@ -63,9 +63,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 7fe1442cd..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
@@ -51,9 +51,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 4b1cee2a1..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
@@ -50,9 +50,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 236e15544..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
@@ -68,9 +68,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 07e53d521..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
@@ -51,9 +51,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 03797efde..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
@@ -51,9 +51,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 c10befa1d..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
@@ -51,9 +51,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 43980afde..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
@@ -47,9 +47,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 2536bcd5c..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
@@ -51,9 +51,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 ba757a540..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
@@ -47,9 +47,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 1ddb8a95f..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
@@ -47,9 +47,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 cec1f51a1..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
@@ -50,9 +50,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 3f4c85a23..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
@@ -50,9 +50,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 3c00e92de..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
@@ -50,9 +50,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 8bb5e0b39..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
@@ -50,9 +50,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 d7ac30d55..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
@@ -50,9 +50,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 541061252..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
@@ -50,9 +50,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 f2f89aadb..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
@@ -50,9 +50,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 611a96e7e..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
@@ -51,9 +51,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 8efcb39bf..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
@@ -50,9 +50,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 bd306fb89..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
@@ -50,9 +50,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 3d9870ae1..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
@@ -50,9 +50,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             double mx = motX;
             double my = motY;
             double mz = motZ;
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 b2a7aec24..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.getBlock().a(block, null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
@@ -66,7 +66,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
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 cce55fa75..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
@@ -27,9 +27,8 @@ public class CustomEntityRegistry extends RegistryMaterials implements Supplier<
 
     @Override
     public int a(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.a((EntityTypes) key);
     }
 
@@ -45,9 +44,8 @@ public class CustomEntityRegistry extends RegistryMaterials implements Supplier<
 
     public EntityTypes findType(Class<?> search) {
         for (Object type : wrapped) {
-            if (((EntityTypes) type).c() == search) {
+            if (((EntityTypes) type).c() == search)
                 return (EntityTypes) type;
-            }
         }
         return null;
     }
@@ -59,17 +57,15 @@ public class CustomEntityRegistry extends RegistryMaterials implements Supplier<
 
     @Override
     public EntityTypes get(MinecraftKey key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
     @Override
     public MinecraftKey getKey(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey((EntityTypes) value);
     }
 
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 77eaba417..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
@@ -436,9 +436,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().ap();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -484,9 +483,8 @@ public class NMSImpl implements NMSBridge {
             }
         } catch (Exception e) {
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.set(ret, bserver);
@@ -512,9 +510,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.b()) {
+        if (controller == null || !controller.b())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -525,9 +522,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aS;
     }
 
@@ -588,7 +584,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -636,8 +632,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -655,23 +651,14 @@ public class NMSImpl implements NMSBridge {
                 Iterables.transform(dest,
                         input -> new PathPoint(input.getBlockX(), input.getBlockY(), input.getBlockZ())),
                 PathPoint.class));
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -766,11 +753,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -935,7 +921,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -946,8 +932,9 @@ public class NMSImpl implements NMSBridge {
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY))
                     - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -978,7 +965,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1027,8 +1014,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(new Location(player.getWorld(), 0, 0, 0),
@@ -1039,8 +1024,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.windowId = handle.nextContainerCounter();
@@ -1078,12 +1063,11 @@ public class NMSImpl implements NMSBridge {
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.playerTick();
-            if (!removeFromPlayerList) {
+            if (!removeFromPlayerList)
                 return;
-            }
             Entity entity1 = entity.getVehicle();
             if (entity1 != null) {
-                if ((entity1.dead) || (!entity1.w(entity))) {
+                if (entity1.dead || !entity1.w(entity)) {
                     entity.stopRiding();
                 }
             } else {
@@ -1118,8 +1102,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             EntityTypes<?> type = ENTITY_REGISTRY.findType(search);
             MinecraftKey key = ENTITY_REGISTRY.getKey(type);
-            if (key == null)
+            if (key == null) {
                 continue;
+            }
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
             return;
@@ -1458,8 +1443,8 @@ public class NMSImpl implements NMSBridge {
         EntityPlayer from = (EntityPlayer) getHandle(entity);
         PerPlayerMetadata<Long> meta = CitizensAPI.getLocationLookup().registerMetadata("sleeping", null);
         if (sleep) {
-            List<Player> nearbyPlayers = Lists.newArrayList(Iterables
-                    .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> {
+            List<Player> nearbyPlayers = Lists.newArrayList(
+                    Iterables.filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), p -> {
                         Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString());
                         if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000)
                             return true;
@@ -1498,7 +1483,7 @@ public class NMSImpl implements NMSBridge {
             list.add(new PacketPlayOutEntityTeleport(from));
             for (Player nearby : nearbyPlayers) {
                 nearby.sendBlockChange(bedLoc, Material.BLACK_BED, facingByte);
-                list.forEach((packet) -> sendPacket(nearby, packet));
+                list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
         } else {
@@ -1627,9 +1612,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1702,9 +1686,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_13_R2.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1713,25 +1696,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_13_R2.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_13_R2.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_13_R2.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_13_R2.NBTTagInt) base).asInt());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_13_R2.NBTTagFloat) base).asFloat());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_13_R2.NBTTagDouble) base).asDouble());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_13_R2.NBTTagLong) base).asLong());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_13_R2.NBTTagShort) base).asShort());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_13_R2.NBTTagByte) base).asByte());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_13_R2.NBTTagByteArray) base).c());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_13_R2.NBTTagIntArray) base).d());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagString)
             return new StringTag(key, base.asString());
-        } else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_13_R2.NBTTagList) {
             List<net.minecraft.server.v1_13_R2.NBTBase> list = (List<net.minecraft.server.v1_13_R2.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1741,24 +1724,22 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(EntityLiving entity, float f, float f1, float f2) {
-        if ((entity.cP()) || (entity.bT())) {
+        if (entity.cP() || entity.bT()) {
             double d0 = 0.08D;
-            if ((entity.motY <= 0.0D) && (entity.hasEffect(MobEffects.SLOW_FALLING))) {
+            if (entity.motY <= 0.0D && entity.hasEffect(MobEffects.SLOW_FALLING)) {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
             }
-            if ((entity.isInWater())
-                    && ((!(entity instanceof EntityHuman)) || (!((EntityHuman) entity).abilities.isFlying))) {
+            if (entity.isInWater()
+                    && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d2 = entity.locY;
                 float f5 = entity instanceof EntityPolarBear ? 0.98F : 0.8F;
                 float f4 = 0.02F;
@@ -1781,20 +1762,20 @@ public class NMSImpl implements NMSBridge {
                 entity.motX *= f5;
                 entity.motY *= 0.800000011920929D;
                 entity.motZ *= f5;
-                if ((!entity.isNoGravity()) && (!entity.isSprinting())) {
-                    if ((entity.motY <= 0.0D) && (Math.abs(entity.motY - 0.005D) >= 0.003D)
-                            && (Math.abs(entity.motY - d0 / 16.0D) < 0.003D)) {
+                if (!entity.isNoGravity() && !entity.isSprinting()) {
+                    if (entity.motY <= 0.0D && Math.abs(entity.motY - 0.005D) >= 0.003D
+                            && Math.abs(entity.motY - d0 / 16.0D) < 0.003D) {
                         entity.motY = -0.003D;
                     } else {
                         entity.motY -= d0 / 16.0D;
                     }
                 }
-                if ((entity.positionChanged)
-                        && (entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ))) {
+                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))) {
+            } else if (entity.ax()
+                    && (!(entity instanceof EntityHuman) || !((EntityHuman) entity).abilities.isFlying)) {
                 double d2 = entity.locY;
                 entity.a(f, f1, f2, 0.02F);
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
@@ -1804,8 +1785,8 @@ 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))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d2, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
             } else if (entity.dc()) {
@@ -1820,13 +1801,13 @@ public class NMSImpl implements NMSBridge {
                 float f7 = MathHelper.cos(f6);
                 f7 = (float) (f7 * f7 * Math.min(1.0D, d4 / 0.4D));
                 entity.motY += d0 * (-1.0D + f7 * 0.75D);
-                if ((entity.motY < 0.0D) && (d1 > 0.0D)) {
+                if (entity.motY < 0.0D && d1 > 0.0D) {
                     double d5 = entity.motY * -0.1D * f7;
                     entity.motY += d5;
                     entity.motX += vec3d.x * d5 / d1;
                     entity.motZ += vec3d.z * d5 / d1;
                 }
-                if ((f6 < 0.0F) && (d1 > 0.0D)) {
+                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;
@@ -1840,7 +1821,7 @@ public class NMSImpl implements NMSBridge {
                 entity.motY *= 0.9800000190734863D;
                 entity.motZ *= 0.9900000095367432D;
                 entity.move(EnumMoveType.SELF, entity.motX, entity.motY, entity.motZ);
-                if ((entity.positionChanged) && (!entity.world.isClientSide)) {
+                if (entity.positionChanged && !entity.world.isClientSide) {
                     double d5 = Math.sqrt(entity.motX * entity.motX + entity.motZ * entity.motZ);
                     double d6 = d3 - d5;
                     float f8 = (float) (d6 * 10.0D - 3.0D);
@@ -1850,8 +1831,8 @@ public class NMSImpl implements NMSBridge {
                         entity.damageEntity(DamageSource.FLY_INTO_WALL, f8);
                     }
                 }
-                if ((entity.onGround) && (!entity.world.isClientSide) && (entity.getFlag(7))
-                        && (!CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())) {
+                if (entity.onGround && !entity.world.isClientSide && entity.getFlag(7)
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setFlag(7, false);
                 }
             } else {
@@ -1886,13 +1867,13 @@ 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)) {
+                        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_())) {
+                    if (entity.positionChanged && entity.z_()) {
                         entity.motY = 0.2D;
                     }
                     if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -1901,8 +1882,8 @@ public class NMSImpl implements NMSBridge {
                         entity.fallDistance = 0.0F;
                     } else {
                         getBlockPositionBE(blockposition_b, entity.locX, 0.0D, entity.locZ);
-                        if ((entity.world.isClientSide) && ((!entity.world.isLoaded(blockposition_b))
-                                || (!entity.world.getChunkAtWorldCoords(blockposition_b).y()))) {
+                        if (entity.world.isClientSide && (!entity.world.isLoaded(blockposition_b)
+                                || !entity.world.getChunkAtWorldCoords(blockposition_b).y())) {
                             if (entity.locY > 0.0D) {
                                 entity.motY = -0.1D;
                             } else {
@@ -1936,7 +1917,7 @@ public class NMSImpl implements NMSBridge {
         entity.aI = entity.aJ;
         double d0 = entity.locX - entity.lastX;
         double d2 = entity.locZ - entity.lastZ;
-        double d1 = (entity instanceof EntityBird) ? entity.locY - entity.lastY : 0.0D;
+        double d1 = entity instanceof EntityBird ? entity.locY - entity.lastY : 0.0D;
         float f3 = MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 4.0F;
         if (f3 > 1.0F) {
             f3 = 1.0F;
@@ -2001,9 +1982,8 @@ public class NMSImpl implements NMSBridge {
         try {
             network.socketAddress = socketAddress;
         } catch (NoSuchFieldError ex) {
-            if (NETWORK_ADDRESS == null) {
+            if (NETWORK_ADDRESS == null)
                 return;
-            }
             try {
                 NETWORK_ADDRESS.set(network, socketAddress);
             } catch (IllegalArgumentException e) {
@@ -2042,9 +2022,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, EntityInsentient handle, float f, float f1, float f2, float speed) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
             handle.a(f, f1, f2, speed > 0 ? speed : handle instanceof EntityTurtle ? 0.1F : 0.01F);
             handle.move(EnumMoveType.SELF, handle.motX, handle.motY, handle.motZ);
@@ -2067,7 +2046,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2076,8 +2055,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
@@ -2111,15 +2090,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
-        if ((f != entity.width) || (f1 != entity.length)) {
+        if (f != entity.width || f1 != entity.length) {
             float f2 = entity.width;
             entity.width = f;
             entity.length = f1;
             BoundingBox bb = NMSBoundingBox.wrap(entity.getBoundingBox());
             entity.a(new AxisAlignedBB(bb.minX, bb.minY, bb.minZ, bb.minX + entity.width, bb.minY + entity.length,
                     bb.minZ + entity.width));
-            if ((entity.width > f2) && (!justCreated) && (!entity.world.isClientSide))
+            if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move(EnumMoveType.SELF, (f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
+            }
         }
     }
 
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 afad6ca63..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
@@ -43,7 +43,7 @@ public class PlayerControllerMove extends ControllerMove {
             double d2 = this.c - i;
             double d3 = d0 * d0 + d2 * d2 + d1 * d1;
             if (d3 < 2.500000277905201E-007D) {
-                this.a.bj = (0.0F); // bi
+                this.a.bj = 0.0F; // bi
                 return;
             }
             float f = (float) Math.toDegrees(Math.atan2(d1, d0)) - 90.0F;
@@ -57,7 +57,7 @@ public class PlayerControllerMove extends ControllerMove {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;
                 ((EntityInsentient) this.a).getControllerJump().a();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 if (this.a instanceof EntityHumanNPC) {
                     ((EntityHumanNPC) this.a).getControllerJump().a();
                 } else {
@@ -86,9 +86,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (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 b26fed5e1..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
@@ -95,16 +95,15 @@ public class PlayerNavigation extends NavigationAbstract {
     @Override
     public boolean a(Entity paramEntity, double paramDouble) {
         PathEntity localPathEntity = a(paramEntity);
-        return (localPathEntity != null) && (a(localPathEntity, paramDouble));
+        return localPathEntity != null && a(localPathEntity, paramDouble);
     }
 
     private boolean a(int paramInt1, int paramInt2, int paramInt3, int paramInt4, int paramInt5, int paramInt6,
             Vec3D paramVec3D, double paramDouble1, double paramDouble2) {
         int i = paramInt1 - paramInt4 / 2;
         int j = paramInt3 - paramInt6 / 2;
-        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2)) {
+        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2))
             return false;
-        }
         for (int k = i; k < i + paramInt4; k++) {
             for (int m = j; m < j + paramInt6; m++) {
                 double d1 = k + 0.5D - paramVec3D.x;
@@ -112,20 +111,17 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                     PathType localPathType = this.o.a(this.b, k, paramInt2 - 1, m, this.a, paramInt4, paramInt5,
                             paramInt6, true, true);
-                    if ((localPathType == PathType.WATER) || (localPathType == PathType.LAVA)
-                            || (localPathType == PathType.OPEN)) {
+                    if (localPathType == PathType.WATER || localPathType == PathType.LAVA
+                            || localPathType == PathType.OPEN)
                         return false;
-                    }
                     localPathType = this.o.a(this.b, k, paramInt2, m, this.a, paramInt4, paramInt5, paramInt6, true,
                             true);
                     float f = this.a.a(localPathType);
-                    if ((f < 0.0F) || (f >= 8.0F)) {
+                    if (f < 0.0F || f >= 8.0F)
                         return false;
-                    }
-                    if ((localPathType == PathType.DAMAGE_FIRE) || (localPathType == PathType.DANGER_FIRE)
-                            || (localPathType == PathType.DAMAGE_OTHER)) {
+                    if (localPathType == PathType.DAMAGE_FIRE || localPathType == PathType.DANGER_FIRE
+                            || localPathType == PathType.DAMAGE_OTHER)
                         return false;
-                    }
                 }
             }
         }
@@ -142,9 +138,8 @@ public class PlayerNavigation extends NavigationAbstract {
             this.c = paramPathEntity;
         }
         E_();
-        if (this.c.d() <= 0) {
+        if (this.c.d() <= 0)
             return false;
-        }
         this.d = paramDouble;
         Vec3D localVec3D = c();
         this.f = this.e;
@@ -161,16 +156,16 @@ public class PlayerNavigation extends NavigationAbstract {
             this.f = this.e;
             this.g = paramVec3D;
         }
-        if ((this.c != null) && (!this.c.b())) {
+        if (this.c != null && !this.c.b()) {
             Vec3D localVec3D = this.c.f();
             if (localVec3D.equals(this.h)) {
                 this.i += getMonotonicMillis() - this.j;
             } else {
                 this.h = localVec3D;
                 double d1 = paramVec3D.f(this.h);
-                this.k = (this.a.cK() > 0.0F ? d1 / this.a.cK() * 1000.0D : 0.0D);
+                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)) {
+            if (this.k > 0.0D && this.i > this.k * 3.0D) {
                 this.h = Vec3D.a;
                 this.i = 0L;
                 this.k = 0.0D;
@@ -187,17 +182,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double d1 = paramVec3D2.x - paramVec3D1.x;
         double d2 = paramVec3D2.z - paramVec3D1.z;
         double d3 = d1 * d1 + d2 * d2;
-        if (d3 < 1.0E-8D) {
+        if (d3 < 1.0E-8D)
             return false;
-        }
         double d4 = 1.0D / Math.sqrt(d3);
         d1 *= d4;
         d2 *= d4;
         paramInt1 += 2;
         paramInt3 += 2;
-        if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+        if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
             return false;
-        }
         paramInt1 -= 2;
         paramInt3 -= 2;
         double d5 = 1.0D / Math.abs(d1);
@@ -218,7 +211,7 @@ public class PlayerNavigation extends NavigationAbstract {
         int i1 = MathHelper.floor(paramVec3D2.z);
         int i2 = n - i;
         int i3 = i1 - j;
-        while ((i2 * k > 0) || (i3 * m > 0)) {
+        while (i2 * k > 0 || i3 * m > 0) {
             if (d7 < d8) {
                 d7 += d5;
                 i += k;
@@ -228,16 +221,15 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-            if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+            if (!a(i, (int) paramVec3D1.y, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
-            }
         }
         return true;
     }
 
     @Override
     protected boolean b() {
-        return (this.a.onGround) || (r()) || (this.a.isPassenger());
+        return this.a.onGround || r() || this.a.isPassenger();
     }
 
     @Override
@@ -245,21 +237,20 @@ public class PlayerNavigation extends NavigationAbstract {
         BlockPosition localBlockPosition;
         if (this.b.getType(paramBlockPosition).isAir()) {
             localBlockPosition = paramBlockPosition.down();
-            while ((localBlockPosition.getY() > 0) && (this.b.getType(localBlockPosition).isAir())) {
+            while (localBlockPosition.getY() > 0 && this.b.getType(localBlockPosition).isAir()) {
                 localBlockPosition = localBlockPosition.down();
             }
-            if (localBlockPosition.getY() > 0) {
+            if (localBlockPosition.getY() > 0)
                 return superb(localBlockPosition.up());
-            }
-            while ((localBlockPosition.getY() < this.b.getHeight()) && (this.b.getType(localBlockPosition).isAir())) {
+            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())) {
+            while (localBlockPosition.getY() < this.b.getHeight()
+                    && this.b.getType(localBlockPosition).getMaterial().isBuildable()) {
                 localBlockPosition = localBlockPosition.up();
             }
             return superb(localBlockPosition);
@@ -278,9 +269,8 @@ public class PlayerNavigation extends NavigationAbstract {
             double d1 = localBlockPosition.getX() + 0.5D - paramVec3D.x;
             double d2 = localBlockPosition.getZ() + 0.5D - paramVec3D.z;
             if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
-                if (!this.b.getType(localBlockPosition).a(this.b, localBlockPosition, PathMode.LAND)) {
+                if (!this.b.getType(localBlockPosition).a(this.b, localBlockPosition, PathMode.LAND))
                     return false;
-                }
             }
         }
         return true;
@@ -301,24 +291,22 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.m) {
             l();
         }
-        if (p()) {
+        if (p())
             return;
-        }
         if (b()) {
             o();
-        } else if ((this.c != null) && (this.c.e() < this.c.d())) {
+        } else if (this.c != null && this.c.e() < this.c.d()) {
             Vec3D localVec3D = c();
             Vec3D localObject = this.c.a(this.a, this.c.e());
-            if ((localVec3D.y > localObject.y) && (!this.a.onGround)
-                    && (MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x))
-                    && (MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z))) {
+            if (localVec3D.y > localObject.y && !this.a.onGround
+                    && MathHelper.floor(localVec3D.x) == MathHelper.floor(localObject.x)
+                    && MathHelper.floor(localVec3D.z) == MathHelper.floor(localObject.z)) {
                 this.c.c(this.c.e() + 1);
             }
         }
         n();
-        if (p()) {
+        if (p())
             return;
-        }
         Vec3D localVec3D = this.c.a(this.a);
         Object localObject = new BlockPosition(localVec3D);
         this.a.getControllerMove().a(localVec3D.x,
@@ -338,9 +326,8 @@ public class PlayerNavigation extends NavigationAbstract {
         if (this.pp) {
             BoundingBox bb = NMSBoundingBox.wrap(this.a.getBoundingBox());
             if (this.b.e(new BlockPosition(MathHelper.floor(this.a.locX), (int) (bb.minY + 0.5D),
-                    MathHelper.floor(this.a.locZ)))) {
+                    MathHelper.floor(this.a.locZ))))
                 return;
-            }
             for (int i = 0; i < this.c.d(); i++) {
                 PathPoint localPathPoint = this.c.a(i);
                 if (this.b.e(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c))) {
@@ -403,11 +390,11 @@ public class PlayerNavigation extends NavigationAbstract {
                 break;
             }
         }
-        this.l = (this.a.width > 0.75F ? this.a.width / 2.0F : 0.75F - this.a.width / 2.0F);
+        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)
-                && (MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.l)
-                && (Math.abs(this.a.locY - localVec3D2.y) < 1.0D)) {
+        if (MathHelper.e((float) (this.a.locX - (localVec3D2.x + 0.5D))) < this.l
+                && MathHelper.e((float) (this.a.locZ - (localVec3D2.z + 0.5D))) < this.l
+                && Math.abs(this.a.locY - localVec3D2.y) < 1.0D) {
             this.c.c(this.c.e() + 1);
         }
         int i3 = MathHelper.f(this.a.width);
@@ -424,7 +411,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public boolean p() {
-        return (this.c == null) || (this.c.b());
+        return this.c == null || this.c.b();
     }
 
     @Override
@@ -434,7 +421,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean r() {
-        return (this.a.aq()) || (this.a.ax());
+        return this.a.aq() || this.a.ax();
     }
 
     @Override
@@ -447,12 +434,10 @@ public class PlayerNavigation extends NavigationAbstract {
     }
 
     public PathEntity superb(BlockPosition paramBlockPosition) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
-        if ((this.c != null) && (!this.c.b()) && (paramBlockPosition.equals(this.q))) {
+        if (this.c != null && !this.c.b() && paramBlockPosition.equals(this.q))
             return this.c;
-        }
         this.q = paramBlockPosition;
         float f1 = j();
         try {
@@ -482,9 +467,8 @@ public class PlayerNavigation extends NavigationAbstract {
     }
 
     protected void superE_() {
-        if (this.c == null) {
+        if (this.c == null)
             return;
-        }
         for (int i1 = 0; i1 < this.c.d(); i1++) {
             PathPoint localPathPoint = this.c.a(i1);
             Object localObject = i1 + 1 < this.c.d() ? this.c.a(i1 + 1) : null;
@@ -493,7 +477,7 @@ public class PlayerNavigation extends NavigationAbstract {
             Block localBlock = localIBlockData.getBlock();
             if (localBlock == Blocks.CAULDRON) {
                 this.c.a(i1, localPathPoint.a(localPathPoint.a, localPathPoint.b + 1, localPathPoint.c));
-                if ((localObject != null) && (localPathPoint.b >= ((PathPoint) localObject).b)) {
+                if (localObject != null && localPathPoint.b >= ((PathPoint) localObject).b) {
                     this.c.a(i1 + 1, ((PathPoint) localObject).a(((PathPoint) localObject).a, localPathPoint.b + 1,
                             ((PathPoint) localObject).c));
                 }
@@ -508,9 +492,8 @@ public class PlayerNavigation extends NavigationAbstract {
 
     private int u() {
         BoundingBox bb = NMSBoundingBox.wrap(this.a.getBoundingBox());
-        if ((!this.a.isInWater()) || (!t())) {
+        if (!this.a.isInWater() || !t())
             return (int) (bb.minY + 0.5D);
-        }
         int i = (int) bb.minY;
         Block localBlock = this.b
                 .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ))).getBlock();
@@ -521,9 +504,8 @@ public class PlayerNavigation extends NavigationAbstract {
                     .getType(new BlockPosition(MathHelper.floor(this.a.locX), i, MathHelper.floor(this.a.locZ)))
                     .getBlock();
             j++;
-            if (j > 16) {
+            if (j > 16)
                 return (int) bb.minY;
-            }
         }
         return i;
     }
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 5d550c608..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
@@ -83,10 +83,10 @@ public class PlayerPathfinder extends Pathfinder {
         }
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
-        arrayOfPathPoint[(--i)] = localPathPoint;
+        arrayOfPathPoint[--i] = localPathPoint;
         while (localPathPoint.h != null) {
             localPathPoint = localPathPoint.h;
-            arrayOfPathPoint[(--i)] = localPathPoint;
+            arrayOfPathPoint[--i] = localPathPoint;
         }
         return new PathEntity(arrayOfPathPoint);
     }
@@ -118,25 +118,24 @@ public class PlayerPathfinder extends Pathfinder {
             for (int k = 0; k < j; k++) {
                 PathPoint localPathPoint = this.c[k];
                 float f1 = ((PathPoint) localObject2).c(localPathPoint);
-                localPathPoint.j = (((PathPoint) localObject2).j + f1);
-                localPathPoint.k = (f1 + localPathPoint.l);
+                localPathPoint.j = ((PathPoint) localObject2).j + f1;
+                localPathPoint.k = f1 + localPathPoint.l;
                 float f2 = ((PathPoint) localObject2).e + localPathPoint.k;
-                if ((localPathPoint.j < paramFloat) && ((!localPathPoint.a()) || (f2 < localPathPoint.e))) {
-                    localPathPoint.h = ((PathPoint) localObject2);
+                if (localPathPoint.j < paramFloat && (!localPathPoint.a() || f2 < localPathPoint.e)) {
+                    localPathPoint.h = (PathPoint) localObject2;
                     localPathPoint.e = f2;
-                    localPathPoint.f = (localPathPoint.c(paramPathPoint2) + localPathPoint.l);
+                    localPathPoint.f = localPathPoint.c(paramPathPoint2) + localPathPoint.l;
                     if (localPathPoint.a()) {
                         this.a.a(localPathPoint, localPathPoint.e + localPathPoint.f);
                     } else {
-                        localPathPoint.g = (localPathPoint.e + localPathPoint.f);
+                        localPathPoint.g = localPathPoint.e + localPathPoint.f;
                         this.a.a(localPathPoint);
                     }
                 }
             }
         }
-        if (localObject1 == paramPathPoint1) {
+        if (localObject1 == paramPathPoint1)
             return null;
-        }
         Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1);
         return (PathEntity) localObject2;
     }
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 9c5e422f7..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
@@ -10,7 +10,7 @@ import net.minecraft.server.v1_13_R2.PathfinderAbstract;
 public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
     protected IBlockAccess a;
     protected EntityHumanNPC b;
-    protected final IntHashMap<PathPoint> c = new IntHashMap<PathPoint>();
+    protected final IntHashMap<PathPoint> c = new IntHashMap<>();
     protected int d;
     protected int e;
     protected int f;
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 2a9b2301e..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
@@ -90,25 +90,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         double var13 = var5.width / 2.0D;
         BlockPosition var15 = new BlockPosition(var5);
         var12 = this.a(var1, var2, var3, var4, var6, var7, var8, var9, var10, var11, var12, var15);
-        if (var11.contains(PathType.FENCE)) {
+        if (var11.contains(PathType.FENCE))
             return PathType.FENCE;
-        } else {
+        else {
             PathType var16 = PathType.BLOCKED;
             Iterator var17 = var11.iterator();
             while (var17.hasNext()) {
                 PathType var18 = (PathType) var17.next();
-                if (var5.a(var18) < 0.0F) {
+                if (var5.a(var18) < 0.0F)
                     return var18;
-                }
                 if (var5.a(var18) >= var5.a(var16)) {
                     var16 = var18;
                 }
             }
-            if (var12 == PathType.OPEN && var5.a(var16) == 0.0F) {
+            if (var12 == PathType.OPEN && var5.a(var16) == 0.0F)
                 return PathType.OPEN;
-            } else {
+            else
                 return var16;
-            }
         }
     }
 
@@ -120,25 +118,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         double var13 = var5.width / 2.0D;
         BlockPosition var15 = new BlockPosition(var5);
         var12 = this.a(var1, var2, var3, var4, var6, var7, var8, var9, var10, var11, var12, var15);
-        if (var11.contains(PathType.FENCE)) {
+        if (var11.contains(PathType.FENCE))
             return PathType.FENCE;
-        } else {
+        else {
             PathType var16 = PathType.BLOCKED;
             Iterator var17 = var11.iterator();
             while (var17.hasNext()) {
                 PathType var18 = (PathType) var17.next();
-                if (var5.a(var18) < 0.0F) {
+                if (var5.a(var18) < 0.0F)
                     return var18;
-                }
                 if (var5.a(var18) >= var5.a(var16)) {
                     var16 = var18;
                 }
             }
-            if (var12 == PathType.OPEN && var5.a(var16) == 0.0F) {
+            if (var12 == PathType.OPEN && var5.a(var16) == 0.0F)
                 return PathType.OPEN;
-            } else {
+            else
                 return var16;
-            }
         }
     }
 
@@ -225,9 +221,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         PathPoint var8 = null;
         BlockPosition var9 = new BlockPosition(var1, var2, var3);
         double var10 = a(this.a, var9);
-        if (var10 - var5 > 1.125D) {
+        if (var10 - var5 > 1.125D)
             return null;
-        } else {
+        else {
             PathType var12 = this.a(this.b, var1, var2, var3);
             float var13 = this.b.a(var12);
             double var14 = this.b.width / 2.0D;
@@ -236,9 +232,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var8.m = var12;
                 var8.l = Math.max(var8.l, var13);
             }
-            if (var12 == PathType.WALKABLE) {
-                return var8;
-            } else {
+            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);
                     if (var8 != null && (var8.m == PathType.OPEN || var8.m == PathType.WALKABLE)
@@ -253,15 +247,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     }
                 }
                 if (var12 == PathType.WATER && !this.e()) {
-                    if (this.a(this.b, var1, var2 - 1, var3) != PathType.WATER) {
+                    if (this.a(this.b, var1, var2 - 1, var3) != PathType.WATER)
                         return var8;
-                    }
                     while (var2 > 0) {
                         --var2;
                         var12 = this.a(this.b, var1, var2, var3);
-                        if (var12 != PathType.WATER) {
+                        if (var12 != PathType.WATER)
                             return var8;
-                        }
                         var8 = this.a(var1, var2, var3);
                         var8.m = var12;
                         var8.l = Math.max(var8.l, this.b.a(var12));
@@ -270,9 +262,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 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);
-                    if (!this.b.world.getCubes((Entity) null, var21)) {
+                    if (!this.b.world.getCubes((Entity) null, var21))
                         return null;
-                    }
                     if (this.b.width >= 1.0F) {
                         PathType var17 = this.a(this.b, var1, var2 - 1, var3);
                         if (var17 == PathType.BLOCKED) {
@@ -285,9 +276,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     int var22 = 0;
                     while (var2 > 0 && var12 == PathType.OPEN) {
                         --var2;
-                        if (var22++ >= b.bn()) {
+                        if (var22++ >= b.bn())
                             return null;
-                        }
                         var12 = this.a(this.b, var1, var2, var3);
                         var13 = this.b.a(var12);
                         if (var12 != PathType.OPEN && var13 >= 0.0F) {
@@ -296,13 +286,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                             var8.l = Math.max(var8.l, var13);
                             break;
                         }
-                        if (var13 < 0.0F) {
+                        if (var13 < 0.0F)
                             return null;
-                        }
                     }
                 }
-                return var8;
             }
+            return var8;
         }
     }
 
@@ -399,9 +388,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             while (var5.hasNext()) {
                 BlockPosition var6 = (BlockPosition) var5.next();
                 PathType var7 = this.a(this.b, var6);
-                if (this.b.a(var7) >= 0.0F) {
+                if (this.b.a(var7) >= 0.0F)
                     return this.a(var6.getX(), var6.getY(), var6.getZ());
-                }
             }
         }
         return this.a(var2.getX(), var1, var2.getZ());
@@ -412,25 +400,25 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         IBlockData var6 = var1.getType(var5);
         Block var7 = var6.getBlock();
         Material var8 = var6.getMaterial();
-        if (var6.isAir()) {
+        if (var6.isAir())
             return PathType.OPEN;
-        } else if (var7 != Blocks.OAK_TRAPDOOR && var7 != Blocks.IRON_TRAPDOOR && var7 != Blocks.LILY_PAD) {
-            if (var7 == Blocks.FIRE) {
+        else if (var7 != Blocks.OAK_TRAPDOOR && var7 != Blocks.IRON_TRAPDOOR && var7 != Blocks.LILY_PAD) {
+            if (var7 == Blocks.FIRE)
                 return PathType.DAMAGE_FIRE;
-            } else if (var7 == Blocks.CACTUS) {
+            else if (var7 == Blocks.CACTUS)
                 return PathType.DAMAGE_CACTUS;
-            } else if (var7 instanceof BlockDoor && var8 == Material.WOOD && !var6.get(BlockDoor.OPEN).booleanValue()) {
+            else if (var7 instanceof BlockDoor && var8 == Material.WOOD && !var6.get(BlockDoor.OPEN).booleanValue())
                 return PathType.DOOR_WOOD_CLOSED;
-            } else if (var7 instanceof BlockDoor && var8 == Material.ORE && !var6.get(BlockDoor.OPEN).booleanValue()) {
+            else if (var7 instanceof BlockDoor && var8 == Material.ORE && !var6.get(BlockDoor.OPEN).booleanValue())
                 return PathType.DOOR_IRON_CLOSED;
-            } else if (var7 instanceof BlockDoor && var6.get(BlockDoor.OPEN).booleanValue()) {
+            else if (var7 instanceof BlockDoor && var6.get(BlockDoor.OPEN).booleanValue())
                 return PathType.DOOR_OPEN;
-            } else if (var7 instanceof BlockMinecartTrackAbstract) {
+            else if (var7 instanceof BlockMinecartTrackAbstract)
                 return PathType.RAIL;
-            } else if (var7 instanceof BlockFence || var7 instanceof BlockCobbleWall
-                    || var7 instanceof BlockFenceGate && !var6.get(BlockFenceGate.OPEN).booleanValue()) {
+            else if (var7 instanceof BlockFence || var7 instanceof BlockCobbleWall
+                    || var7 instanceof BlockFenceGate && !var6.get(BlockFenceGate.OPEN).booleanValue())
                 return PathType.FENCE;
-            } else {
+            else {
                 Fluid var9;
                 try {
                     var9 = var1.getFluid(var5);
@@ -442,17 +430,15 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         return PathType.BLOCKED;
                     }
                 }
-                if (var9.a(TagsFluid.WATER)) {
+                if (var9.a(TagsFluid.WATER))
                     return PathType.WATER;
-                } else if (var9.a(TagsFluid.LAVA)) {
+                else if (var9.a(TagsFluid.LAVA))
                     return PathType.LAVA;
-                } else {
+                else
                     return var6.a(var1, var5, PathMode.LAND) ? PathType.OPEN : PathType.BLOCKED;
-                }
             }
-        } else {
+        } else
             return PathType.TRAPDOOR;
-        }
     }
 
     public static double a(IBlockAccess var0, BlockPosition var1) {
@@ -463,7 +449,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         } catch (NoSuchMethodError ex) {
             try {
                 VoxelShape var3 = (VoxelShape) GET_COLLISION_SHAPE.invoke(var0.getType(var2), var0, var2);
-                return var2.getY() + (((Boolean) IS_EMPTY.invoke(var3)) ? 0.0D : var3.c(EnumAxis.Y));
+                return var2.getY() + ((Boolean) IS_EMPTY.invoke(var3) ? 0.0D : var3.c(EnumAxis.Y));
             } catch (Exception ex2) {
                 ex2.printStackTrace();
                 return 0;
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 58a7ab7f3..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
@@ -72,9 +72,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -83,9 +82,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 fe517a269..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
@@ -75,15 +75,14 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -182,9 +181,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 a2df41c8a..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
@@ -72,15 +72,14 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -176,9 +175,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 6dd26b6f2..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
@@ -91,7 +91,7 @@ public class CatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -104,9 +104,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -199,11 +198,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -221,9 +219,8 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 c23a72ff7..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
@@ -81,7 +81,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -189,11 +188,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -211,9 +209,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 01bbe5e1a..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
@@ -91,7 +91,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -104,9 +104,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -199,11 +198,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -229,9 +227,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 7281d207f..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
@@ -89,7 +89,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -98,9 +98,8 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -113,9 +112,8 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -141,8 +139,9 @@ public class CodController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -209,11 +208,10 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -246,9 +244,8 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 2586f85aa..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
@@ -95,7 +95,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -104,9 +104,8 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -119,9 +118,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -214,11 +212,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -236,9 +233,8 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 605594545..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
@@ -84,7 +84,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,9 +97,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -125,8 +124,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -198,11 +198,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -220,9 +219,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 47568286a..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
@@ -90,7 +90,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -108,9 +108,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -136,8 +135,9 @@ public class DolphinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -204,11 +204,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +217,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 bc200b6be..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
@@ -81,7 +81,7 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -122,8 +121,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -188,11 +188,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +209,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 d4d95b1d5..be7efcc88 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
@@ -77,15 +77,14 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -111,8 +110,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -263,9 +263,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 fae4fda4d..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
@@ -81,15 +81,14 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean a(double d1, double d2, double d3, boolean b) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(d1, d2, d3, b);
-            }
             return false;
         }
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,9 +101,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -130,8 +128,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -196,11 +195,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +216,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 f31732e11..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
@@ -81,7 +81,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -122,8 +121,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -188,11 +188,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +209,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 2c69e8d0f..550aad0a6 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
@@ -100,9 +100,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && playerlistTracker == null) {
+        if (npc != null && playerlistTracker == null)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -139,12 +138,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -159,16 +153,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                ((WorldServer) world).removeEntity(EntityHumanNPC.this);
-            }
-        }, 15); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) () -> ((WorldServer) world).removeEntity(EntityHumanNPC.this), 15); // give enough time for death and smoke animation
     }
 
     @Override
@@ -215,9 +203,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public IChatBaseComponent getPlayerListName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new ChatComponentText("");
-        }
         return super.getPlayerListName();
     }
 
@@ -247,9 +234,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -278,11 +264,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean isClimbing() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.isClimbing();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -423,7 +408,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
                 if (cache != null && !cache.isEmpty()) {
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 da2929780..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
@@ -67,7 +67,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -175,11 +174,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -197,9 +195,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 0c94f6edc..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
@@ -77,7 +77,7 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -185,11 +184,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 77efd95b8..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
@@ -58,15 +58,14 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -168,9 +167,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 44eba5356..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
@@ -67,7 +67,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 6f6b4d714..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
@@ -67,7 +67,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -175,11 +174,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 93aee0ca4..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
@@ -67,7 +67,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -175,11 +174,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 9cae454f0..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
@@ -96,7 +96,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,9 +109,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -127,9 +126,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean ca() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.ca();
         }
 
@@ -217,11 +215,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 524d96905..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
@@ -58,6 +58,7 @@ public class HorseDonkeyController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseDonkeyNPC(EntityTypes<? extends EntityHorseDonkey> types, World world) {
             this(types, world, null);
         }
@@ -94,7 +95,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,9 +108,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -125,9 +125,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean ca() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.ca();
         }
 
@@ -215,11 +214,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -252,9 +250,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 badb24d70..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
@@ -95,7 +95,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -108,9 +108,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -126,9 +125,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean ca() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.ca();
         }
 
@@ -216,11 +214,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -253,9 +250,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 ea726139c..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
@@ -96,7 +96,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,9 +109,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -127,9 +126,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean ca() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.ca();
         }
 
@@ -217,11 +215,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 ef3b6381f..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
@@ -96,7 +96,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,9 +109,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -127,9 +126,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean ca() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.ca();
         }
 
@@ -217,11 +215,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 fb8baafe4..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_14_R1.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 56f53c512..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
@@ -67,7 +67,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -175,11 +174,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -197,9 +195,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 87b579247..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
@@ -67,7 +67,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 83a07434f..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
@@ -58,6 +58,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityTypes<? extends EntityLlama> types, World world) {
             this(types, world, null);
         }
@@ -94,7 +95,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,9 +108,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -125,9 +125,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean ca() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.ca();
         }
 
@@ -215,11 +214,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -252,9 +250,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 5cf5feb49..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
@@ -73,7 +73,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -86,9 +86,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -114,8 +113,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -180,11 +180,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -194,9 +193,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 c5daa9db9..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
@@ -83,7 +83,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_14_R1.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 005ec43fe..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
@@ -79,7 +79,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -99,9 +99,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -127,8 +126,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -193,11 +193,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -208,15 +207,15 @@ public class MushroomCowController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 9c79af391..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
@@ -77,7 +77,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -192,11 +191,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -214,9 +212,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 7ab3604ea..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
@@ -77,7 +77,7 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -185,11 +184,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 1e87556e3..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
@@ -60,24 +60,22 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.a(paramEntityHuman, paramEnumHand);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -176,9 +174,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 7476b32bf..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
@@ -75,7 +75,7 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -88,9 +88,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -116,8 +115,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -189,11 +189,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -214,9 +213,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 5a9d72e54..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
@@ -78,7 +78,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -91,9 +91,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -192,11 +191,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -214,9 +212,8 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 cacd80433..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
@@ -67,7 +67,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 b98a9bbec..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
@@ -77,7 +77,7 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -185,11 +184,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 521df6fcc..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
@@ -68,15 +68,14 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -173,9 +172,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 1cadc6603..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
@@ -78,7 +78,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -87,17 +87,15 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
         @Override
         public EntitySize a(EntityPose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entitypose);
-            }
             return super.a(entitypose).a(1 / s(getPuffState())).a(0.5F);
         }
 
@@ -110,9 +108,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -207,11 +204,10 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -244,9 +240,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 62fd7693d..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
@@ -78,7 +78,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -91,9 +91,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -191,11 +190,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +216,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 616ebe9ea..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
@@ -77,7 +77,7 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -185,11 +184,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 59f35a543..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
@@ -75,7 +75,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -84,9 +84,8 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -99,9 +98,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -127,8 +125,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -195,11 +194,10 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +230,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 deadf85da..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
@@ -77,7 +77,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -118,8 +117,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -184,11 +184,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,15 +198,15 @@ public class SheepController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 2efc66132..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
@@ -68,7 +68,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -81,9 +81,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -109,8 +108,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -175,11 +175,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 8df6b18e4..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
@@ -67,7 +67,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,15 +188,15 @@ public class SilverfishController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 3abc45d1f..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
@@ -67,7 +67,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 2c72932d5..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
@@ -67,7 +67,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 f16d83a8a..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
@@ -67,7 +67,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 764b6c44f..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
@@ -73,7 +73,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -86,9 +86,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -181,11 +180,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -195,9 +193,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 a630c2f2d..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
@@ -67,7 +67,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 c35ec0b3f..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
@@ -67,7 +67,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,15 +188,15 @@ public class SpiderController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 ee507e6eb..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
@@ -67,7 +67,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 5c43936cd..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
@@ -91,7 +91,7 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -104,9 +104,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -199,11 +198,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -229,9 +227,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 f7d6c261b..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
@@ -75,7 +75,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -84,9 +84,8 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
@@ -99,9 +98,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -127,8 +125,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -195,11 +194,10 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +230,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 91864e4c0..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
@@ -74,7 +74,7 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -87,9 +87,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -115,8 +114,9 @@ public class TurtleController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -183,11 +183,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -205,9 +204,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 8562cca31..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
@@ -61,15 +61,14 @@ public class VexController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -153,9 +152,8 @@ public class VexController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
+            if (npc == null)
                 return super.isLeashed();
-            }
             boolean protectedDefault = npc.isProtected();
             if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault))
                 return super.isLeashed();
@@ -175,9 +173,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 d1a3c2da0..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
@@ -58,6 +58,7 @@ public class VillagerController extends MobEntityController {
         private final CitizensNPC npc;
 
         private BehaviorController<EntityVillager> previousBehaviorController;
+
         public EntityVillagerNPC(EntityTypes<? extends EntityVillager> types, World world) {
             this(types, world, null);
         }
@@ -90,7 +91,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -115,9 +116,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -219,11 +219,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -251,9 +250,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 b7e1943d4..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
@@ -77,7 +77,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -90,9 +90,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -185,11 +184,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 b95e7100f..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
@@ -58,6 +58,7 @@ public class WanderingTraderController extends MobEntityController {
         private boolean blockTrades = true;
 
         private final CitizensNPC npc;
+
         public EntityWanderingTraderNPC(EntityTypes<? extends EntityVillagerTrader> types, World world) {
             this(types, world, null);
         }
@@ -90,7 +91,7 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -115,9 +116,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -223,11 +223,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -259,9 +258,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 3b795b970..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
@@ -67,7 +67,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,15 +188,15 @@ public class WitchController extends MobEntityController {
         @Override
         public void mobTick() {
             super.mobTick();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 aecd16602..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
@@ -58,15 +58,14 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -92,8 +91,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,9 +174,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 81338f2ba..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
@@ -79,7 +79,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,9 +92,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +186,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -209,9 +207,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 7cb3ad009..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
@@ -67,7 +67,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 93c8f511e..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
@@ -67,7 +67,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 5bc2b4374..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
@@ -67,7 +67,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -80,9 +80,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -108,8 +107,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -174,11 +174,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,9 +195,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 2c4a81b16..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
@@ -67,9 +67,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 408f5b55b..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
@@ -67,9 +67,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 1a1b30943..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
@@ -67,9 +67,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 ad04f8daf..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
@@ -83,9 +83,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 1db44e10f..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
@@ -67,9 +67,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 9b7f12bbf..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
@@ -67,9 +67,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 229ba0525..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
@@ -67,9 +67,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 0addecc99..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
@@ -58,9 +58,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -69,9 +68,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 bc2d4faa5..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
@@ -53,9 +53,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 d3dd1a03f..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
@@ -75,9 +75,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 1e668bd15..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
@@ -53,9 +53,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 cf67c146c..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
@@ -67,9 +67,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -122,9 +121,8 @@ public class FishingHookController extends MobEntityController {
         @Override
         public double h(Entity entity) {
             // distance check in k()
-            if (entity == this.owner) {
+            if (entity == this.owner)
                 return 0D;
-            }
             return super.h(entity);
         }
 
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 5ecf3cf0a..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
@@ -66,9 +66,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 1327e16ab..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
@@ -66,9 +66,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 aac5848c6..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
@@ -53,9 +53,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 0c5e75756..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
@@ -53,9 +53,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 6acbc1c57..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
@@ -72,9 +72,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 452523b8a..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
@@ -53,9 +53,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 ce7fa3796..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
@@ -53,9 +53,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 b7aea1375..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
@@ -53,9 +53,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 d77fa924c..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
@@ -49,9 +49,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 ca78216d9..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
@@ -53,9 +53,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 b306c4c28..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
@@ -49,9 +49,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 9b9df42ec..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
@@ -49,9 +49,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 5b6c1419e..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
@@ -53,9 +53,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 1d5eb5a28..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
@@ -53,9 +53,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 2f4dd5d65..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
@@ -53,9 +53,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 f617066e9..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
@@ -53,9 +53,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 7b4a5b68c..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
@@ -53,9 +53,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 c9f64ad23..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
@@ -53,9 +53,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 38df13af7..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
@@ -53,9 +53,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 f016d22b5..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
@@ -54,9 +54,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 8e77ecca0..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
@@ -53,9 +53,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 58661ea48..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
@@ -53,9 +53,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 4b14d36f8..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
@@ -53,9 +53,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 2977de229..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
@@ -38,13 +38,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.getBlock().a(block, null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
@@ -67,7 +67,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CustomEntityRegistry.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CustomEntityRegistry.java
index ce649329c..f07fbf949 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CustomEntityRegistry.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/CustomEntityRegistry.java
@@ -27,9 +27,8 @@ public class CustomEntityRegistry extends RegistryBlocks implements Supplier<Reg
 
     @Override
     public int a(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.a((EntityTypes) key);
     }
 
@@ -62,25 +61,22 @@ public class CustomEntityRegistry extends RegistryBlocks implements Supplier<Reg
 
     @Override
     public EntityTypes get(MinecraftKey key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
     @Override
     public MinecraftKey getKey(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey((EntityTypes) value);
     }
 
     @Override
     public Optional getOptional(MinecraftKey var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return Optional.ofNullable(this.wrapped.get(var0));
     }
 
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 9119bfe92..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
@@ -476,9 +476,8 @@ public class NMSImpl implements NMSBridge {
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer()
                 .getMinecraftSessionService();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -512,17 +511,15 @@ public class NMSImpl implements NMSBridge {
                 bserver = ((EntityWither) NMSImpl.getHandle(entity)).bossBattle;
             } else if (entity.getType() == EntityType.ENDER_DRAGON) {
                 Object battleObject = ENDERDRAGON_BATTLE_FIELD.invoke(NMSImpl.getHandle(entity));
-                if (battleObject == null) {
+                if (battleObject == null)
                     return null;
-                }
                 bserver = ((EnderDragonBattle) battleObject).bossBattle;
             }
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -549,9 +546,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.b()) {
+        if (controller == null || !controller.b())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -562,9 +558,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aM;
     }
 
@@ -625,7 +620,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -637,9 +632,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_PROFILE_FIELD == null) {
             SKULL_PROFILE_FIELD = NMS.getField(meta.getClass(), "profile", false);
-            if (SKULL_PROFILE_FIELD == null) {
+            if (SKULL_PROFILE_FIELD == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
@@ -671,8 +665,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -691,23 +685,14 @@ public class NMSImpl implements NMSBridge {
         PathPoint last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final PathEntity path = new PathEntity(list, last != null ? new BlockPosition(last.a, last.b, last.c) : null,
                 true);
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -813,11 +798,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -994,7 +978,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1005,8 +989,9 @@ public class NMSImpl implements NMSBridge {
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY))
                     - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -1037,7 +1022,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1086,8 +1071,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(access.getLocation(),
@@ -1098,8 +1081,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.getBukkitView().setItem(0, anvil.getItem(0));
@@ -1142,8 +1125,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             EntityTypes<?> type = ENTITY_REGISTRY.findType(search);
             MinecraftKey key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1398,9 +1382,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SKULL_PROFILE_FIELD == null) {
             SKULL_PROFILE_FIELD = NMS.getField(meta.getClass(), "profile", false);
-            if (SKULL_PROFILE_FIELD == null) {
+            if (SKULL_PROFILE_FIELD == null)
                 return;
-            }
         }
         try {
             SKULL_PROFILE_FIELD.set(meta, profile);
@@ -1689,9 +1672,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1774,9 +1756,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_14_R1.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1785,25 +1766,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_14_R1.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_14_R1.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_14_R1.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_14_R1.NBTTagInt) base).asInt());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_14_R1.NBTTagFloat) base).asFloat());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_14_R1.NBTTagDouble) base).asDouble());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_14_R1.NBTTagLong) base).asLong());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_14_R1.NBTTagShort) base).asShort());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_14_R1.NBTTagByte) base).asByte());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_14_R1.NBTTagByteArray) base).getBytes());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_14_R1.NBTTagIntArray) base).getInts());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagString)
             return new StringTag(key, base.asString());
-        } else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_14_R1.NBTTagList) {
             List<net.minecraft.server.v1_14_R1.NBTBase> list = (List<net.minecraft.server.v1_14_R1.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1813,12 +1794,10 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
@@ -1871,7 +1850,7 @@ public class NMSImpl implements NMSBridge {
                         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;
+                        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) {
@@ -2080,9 +2059,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, EntityInsentient handle, Vec3D vec3d, float speed) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
             handle.a(speed > 0 ? speed : handle instanceof EntityTurtle ? 0.1F : 0.01F, vec3d);
             handle.move(EnumMoveType.SELF, handle.getMot());
@@ -2112,7 +2090,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2121,8 +2099,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
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 33123c29a..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
@@ -56,7 +56,7 @@ public class PlayerControllerMove extends ControllerMove {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;
                 ((EntityInsentient) this.a).getControllerJump().jump();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 if (this.a instanceof EntityHumanNPC) {
                     ((EntityHumanNPC) this.a).getControllerJump().jump();
                 } else {
@@ -85,9 +85,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (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 3698a9c67..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,17 +87,16 @@ 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) {
+            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()) {
+        if (!this.b.getType(var0).getMaterial().isBuildable())
             return supera(var0, var1);
-        } else {
+        else {
             for (var2 = var0.up(); var2.getY() < this.b.getBuildHeight()
                     && this.b.getType(var2).getMaterial().isBuildable(); var2 = var2.up()) {
             }
@@ -139,27 +138,24 @@ public class PlayerNavigation extends NavigationAbstract {
             double var9) {
         int var11 = var0 - var3 / 2;
         int var12 = var2 - var5 / 2;
-        if (!this.b(var11, var1, var12, var3, var4, var5, var6, var7, var9)) {
+        if (!this.b(var11, var1, var12, var3, var4, var5, var6, var7, var9))
             return false;
-        } else {
+        else {
             for (int var13 = var11; var13 < var11 + var3; ++var13) {
                 for (int var14 = var12; var14 < var12 + var5; ++var14) {
                     double var15 = var13 + 0.5D - var6.x;
                     double var17 = var14 + 0.5D - var6.z;
                     if (var15 * var7 + var17 * var9 >= 0.0D) {
                         PathType var19 = this.o.a(this.b, var13, var1 - 1, var14, this.a, var3, var4, var5, true, true);
-                        if ((var19 == PathType.WATER) || (var19 == PathType.LAVA) || (var19 == PathType.OPEN)) {
+                        if (var19 == PathType.WATER || var19 == PathType.LAVA || var19 == PathType.OPEN)
                             return false;
-                        }
                         var19 = this.o.a(this.b, var13, var1, var14, this.a, var3, var4, var5, true, true);
                         float var20 = this.a.a(var19);
-                        if (var20 < 0.0F || var20 >= 8.0F) {
+                        if (var20 < 0.0F || var20 >= 8.0F)
                             return false;
-                        }
                         if (var19 == PathType.DAMAGE_FIRE || var19 == PathType.DANGER_FIRE
-                                || var19 == PathType.DAMAGE_OTHER) {
+                                || var19 == PathType.DAMAGE_OTHER)
                             return false;
-                        }
                     }
                 }
             }
@@ -177,9 +173,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 this.c = var0;
             }
             this.D_();
-            if (this.c.e() <= 0) {
+            if (this.c.e() <= 0)
                 return false;
-            } else {
+            else {
                 this.d = var1;
                 Vec3D var3 = this.b();
                 this.f = this.e;
@@ -191,18 +187,14 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected PathEntity a(Set var0, int var1, boolean var2, int var3) {
-        if (var0.isEmpty()) {
+        if (var0.isEmpty() || (this.a.locY < 0.0D) || !this.a())
             return null;
-        } else if (this.a.locY < 0.0D) {
-            return null;
-        } else if (!this.a()) {
-            return null;
-        } else if (this.c != null && !this.c.b() && var0.contains(this.q)) {
+        else if (this.c != null && !this.c.b() && var0.contains(this.q))
             return this.c;
-        } else {
+        else {
             this.b.getMethodProfiler().enter("pathfind");
             float var4 = this.i();
-            BlockPosition var5 = var2 ? (new BlockPosition(this.a)).up() : new BlockPosition(this.a);
+            BlockPosition var5 = var2 ? new BlockPosition(this.a).up() : new BlockPosition(this.a);
             int var6 = (int) (var4 + var1);
             IWorldReader var7 = new ChunkCache(this.b, var5.b(-var6, -var6, -var6), var5.b(var6, var6, var6));
             PathEntity var8 = this.s.a(var7, this.a, var0, var4, var3);
@@ -255,17 +247,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double var7 = var1.x - var0.x;
         double var9 = var1.z - var0.z;
         double var11 = var7 * var7 + var9 * var9;
-        if (var11 < 1.0E-8D) {
+        if (var11 < 1.0E-8D)
             return false;
-        } else {
+        else {
             double var13 = 1.0D / Math.sqrt(var11);
             var7 *= var13;
             var9 *= var13;
             var2 += 2;
             var4 += 2;
             if (!this.a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9)) {
-                return false;
-            } else {
                 var2 -= 2;
                 var4 -= 2;
                 double var15 = 1.0D / Math.abs(var7);
@@ -287,9 +277,8 @@ public class PlayerNavigation extends NavigationAbstract {
                 int var27 = var25 - var5;
                 int var28 = var26 - var6;
                 do {
-                    if (var27 * var23 <= 0 && var28 * var24 <= 0) {
+                    if (var27 * var23 <= 0 && var28 * var24 <= 0)
                         return true;
-                    }
                     if (var19 < var21) {
                         var19 += var15;
                         var5 += var23;
@@ -300,8 +289,8 @@ public class PlayerNavigation extends NavigationAbstract {
                         var28 = var26 - var6;
                     }
                 } while (this.a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9));
-                return false;
             }
+            return false;
         }
     }
 
@@ -330,9 +319,8 @@ public class PlayerNavigation extends NavigationAbstract {
         double var13;
         double var15;
         do {
-            if (!var12.hasNext()) {
+            if (!var12.hasNext())
                 return true;
-            }
             var14 = (BlockPosition) var12.next();
             var13 = var14.getX() + 0.5D - var6.x;
             var15 = var14.getZ() + 0.5D - var6.z;
@@ -381,9 +369,8 @@ public class PlayerNavigation extends NavigationAbstract {
     protected void D_() {
         superD_();
         if (this.pp) {
-            if (this.b.f(new BlockPosition(this.a.locX, this.a.getBoundingBox().minY + 0.5D, this.a.locZ))) {
+            if (this.b.f(new BlockPosition(this.a.locX, this.a.getBoundingBox().minY + 0.5D, this.a.locZ)))
                 return;
-            }
             for (int var0 = 0; var0 < this.c.e(); ++var0) {
                 PathPoint var1 = this.c.a(var0);
                 if (this.b.f(new BlockPosition(var1.a, var1.b, var1.c))) {
@@ -500,17 +487,15 @@ public class PlayerNavigation extends NavigationAbstract {
             Block var1 = this.b.getType(new BlockPosition(this.a.locX, var0, this.a.locZ)).getBlock();
             int var2 = 0;
             do {
-                if (var1 != Blocks.WATER) {
+                if (var1 != Blocks.WATER)
                     return var0;
-                }
                 ++var0;
                 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 {
+        } 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 6bfd591af..50df3fc6a 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
@@ -41,9 +41,7 @@ public class PlayerPathfinder extends Pathfinder {
         this.a.a();
         this.e.a(var0, var1);
         PathPoint var5 = this.e.b();
-        Map var6 = var2.stream().collect(Collectors.toMap((var0x) -> {
-            return this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ());
-        }, Function.identity()));
+        Map var6 = var2.stream().collect(Collectors.toMap(var0x -> this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ()), Function.identity()));
         PathEntity var7 = this.a(var5, var6, var3, var4);
         this.e.a();
         return var7;
@@ -54,9 +52,7 @@ public class PlayerPathfinder extends Pathfinder {
         this.a.a();
         this.e.a(var0, var1);
         PathPoint var5 = this.e.b();
-        Map var6 = var2.stream().collect(Collectors.toMap((var0x) -> {
-            return this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ());
-        }, Function.identity()));
+        Map var6 = var2.stream().collect(Collectors.toMap(var0x -> this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ()), Function.identity()));
         PathEntity var7 = this.a(var5, var6, var3, var4);
         this.e.a();
         return var7;
@@ -89,9 +85,7 @@ public class PlayerPathfinder extends Pathfinder {
             }
             PathPoint var6 = this.a.c();
             var6.i = true;
-            var4.stream().filter((var2x) -> {
-                return var6.c(var2x) <= var3;
-            }).forEach(PathDestination::e);
+            var4.stream().filter(var2x -> (var6.c(var2x) <= var3)).forEach(PathDestination::e);
             if (var4.stream().anyMatch(PathDestination::f)) {
                 break;
             }
@@ -118,16 +112,14 @@ public class PlayerPathfinder extends Pathfinder {
         }
         Stream var6;
         if (var4.stream().anyMatch(PathDestination::f)) {
-            var6 = var4.stream().filter(PathDestination::f).map((var1x) -> {
-                return this.a(var1x.d(), (BlockPosition) var1.get(var1x), true);
-            }).sorted(Comparator.comparingInt(PathEntity::e));
+            var6 = var4.stream().filter(PathDestination::f).map(var1x -> this.a(var1x.d(), (BlockPosition) var1.get(var1x), true)).sorted(Comparator.comparingInt(PathEntity::e));
         } else {
             var6 = getFallbackDestinations(var1, var4);
         }
         Optional var7 = var6.findFirst();
-        if (!var7.isPresent()) {
+        if (!var7.isPresent())
             return null;
-        } else {
+        else {
             PathEntity var8 = (PathEntity) var7.get();
             return var8;
         }
@@ -146,11 +138,8 @@ public class PlayerPathfinder extends Pathfinder {
 
     public Stream<PathEntity> getFallbackDestinations(Map<PathDestination, BlockPosition> var1,
             Set<PathDestination> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.a(var1x.d(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(PathEntity::l).thenComparingInt(PathEntity::e));
+        return var5.stream().map(var1x -> this.a(var1x.d(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(PathEntity::l).thenComparingInt(PathEntity::e));
     }
 }
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderAbstract.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderAbstract.java
index ad729c83f..608e0c2b6 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderAbstract.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerPathfinderAbstract.java
@@ -33,9 +33,7 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
 
     @Override
     protected PathPoint a(int var0, int var1, int var2) {
-        return (PathPoint) this.c.computeIfAbsent(PathPoint.b(var0, var1, var2), (var3) -> {
-            return new PathPoint(var0, var1, var2);
-        });
+        return (PathPoint) this.c.computeIfAbsent(PathPoint.b(var0, var1, var2), var3 -> new PathPoint(var0, var1, var2));
     }
 
     public void a(IWorldReader var0, EntityHumanNPC var1) {
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 19484977a..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
@@ -111,25 +111,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         double var12 = var4.getWidth() / 2.0D;
         BlockPosition var14 = new BlockPosition(var4);
         var11 = this.a(var0, var1, var2, var3, var5, var6, var7, var8, var9, var10, var11, var14);
-        if (var10.contains(PathType.FENCE)) {
+        if (var10.contains(PathType.FENCE))
             return PathType.FENCE;
-        } else {
+        else {
             PathType var15 = PathType.BLOCKED;
             Iterator var17 = var10.iterator();
             while (var17.hasNext()) {
                 PathType var16 = (PathType) var17.next();
-                if (var4.a(var16) < 0.0F) {
+                if (var4.a(var16) < 0.0F)
                     return var16;
-                }
                 if (var4.a(var16) >= var4.a(var15)) {
                     var15 = var16;
                 }
             }
-            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F) {
+            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
-            } else {
+            else
                 return var15;
-            }
         }
     }
 
@@ -141,25 +139,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         double var12 = var4.getWidth() / 2.0D;
         BlockPosition var14 = new BlockPosition(var4);
         var11 = this.a(var0, var1, var2, var3, var5, var6, var7, var8, var9, var10, var11, var14);
-        if (var10.contains(PathType.FENCE)) {
+        if (var10.contains(PathType.FENCE))
             return PathType.FENCE;
-        } else {
+        else {
             PathType var15 = PathType.BLOCKED;
             Iterator var17 = var10.iterator();
             while (var17.hasNext()) {
                 PathType var16 = (PathType) var17.next();
-                if (var4.a(var16) < 0.0F) {
+                if (var4.a(var16) < 0.0F)
                     return var16;
-                }
                 if (var4.a(var16) >= var4.a(var15)) {
                     var15 = var16;
                 }
             }
-            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F) {
+            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
-            } else {
+            else
                 return var15;
-            }
         }
     }
 
@@ -226,9 +222,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         PathPoint var7 = null;
         BlockPosition var8 = new BlockPosition(var0, var1, var2);
         double var9 = a(this.a, var8);
-        if (var9 - var4 > 1.125D) {
+        if (var9 - var4 > 1.125D)
             return null;
-        } else {
+        else {
             PathType var11 = this.a(this.b, var0, var1, var2);
             float var12 = this.b.a(var11);
             double var13 = this.b.getWidth() / 2.0D;
@@ -237,9 +233,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var7.l = var11;
                 var7.k = Math.max(var7.k, var12);
             }
-            if (var11 == PathType.WALKABLE) {
-                return var7;
-            } else {
+            if ((var11 != PathType.WALKABLE)) {
                 if ((var7 == null || var7.k < 0.0F) && var3 > 0 && var11 != PathType.FENCE
                         && var11 != PathType.TRAPDOOR) {
                     var7 = this.a(var0, var1 + 1, var2, var3 - 1, var4, var6);
@@ -248,9 +242,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         double var15 = var0 - var6.getAdjacentX() + 0.5D;
                         double var17 = var2 - var6.getAdjacentZ() + 0.5D;
                         AxisAlignedBB var19 = new AxisAlignedBB(var15 - var13,
-                                a(this.a, (new BlockPosition(var15, var1 + 1, var17))) + 0.001D, var17 - var13,
+                                a(this.a, new BlockPosition(var15, var1 + 1, var17)) + 0.001D, var17 - var13,
                                 var15 + var13,
-                                this.b.getHeight() + a(this.a, (new BlockPosition(var7.a, var7.b, var7.c))) - 0.002D,
+                                this.b.getHeight() + a(this.a, new BlockPosition(var7.a, var7.b, var7.c)) - 0.002D,
                                 var17 + var13);
                         if (!this.a.getCubes(this.b, var19)) {
                             var7 = null;
@@ -258,15 +252,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     }
                 }
                 if (var11 == PathType.WATER && !this.e()) {
-                    if (this.a(this.b, var0, var1 - 1, var2) != PathType.WATER) {
+                    if (this.a(this.b, var0, var1 - 1, var2) != PathType.WATER)
                         return var7;
-                    }
                     while (var1 > 0) {
                         --var1;
                         var11 = this.a(this.b, var0, var1, var2);
-                        if (var11 != PathType.WATER) {
+                        if (var11 != PathType.WATER)
                             return var7;
-                        }
                         var7 = this.a(var0, var1, var2);
                         var7.l = var11;
                         var7.k = Math.max(var7.k, this.b.a(var11));
@@ -275,9 +267,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 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);
-                    if (!this.a.getCubes(this.b, var15)) {
+                    if (!this.a.getCubes(this.b, var15))
                         return null;
-                    }
                     if (this.b.getWidth() >= 1.0F) {
                         PathType var16 = this.a(this.b, var0, var1 - 1, var2);
                         if (var16 == PathType.BLOCKED) {
@@ -319,23 +310,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         }
                     }
                 }
-                return var7;
             }
+            return var7;
         }
     }
 
     private boolean a(PathPoint var0, PathPoint var1, PathPoint var2, PathPoint var3) {
-        if (var3 != null && var2 != null && var1 != null) {
-            if (var3.i) {
-                return false;
-            } else if (var2.b <= var0.b && var1.b <= var0.b) {
-                return var3.k >= 0.0F && (var2.b < var0.b || var2.k >= 0.0F) && (var1.b < var0.b || var1.k >= 0.0F);
-            } else {
-                return false;
-            }
-        } else {
+        if (((var3 == null) || (var2 == null) || (var1 == null)) || var3.i)
+            return false;
+        else if (var2.b <= var0.b && var1.b <= var0.b)
+            return var3.k >= 0.0F && (var2.b < var0.b || var2.k >= 0.0F) && (var1.b < var0.b || var1.k >= 0.0F);
+        else
             return false;
-        }
     }
 
     @Override
@@ -346,7 +332,7 @@ 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)));
+        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;
@@ -416,9 +402,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             while (var5.hasNext()) {
                 BlockPosition var4 = (BlockPosition) var5.next();
                 PathType var6 = this.a(this.b, var4);
-                if (this.b.a(var6) >= 0.0F) {
+                if (this.b.a(var6) >= 0.0F)
                     return this.a(var4.getX(), var4.getY(), var4.getZ());
-                }
             }
         }
         return this.a(var1.getX(), var0, var1.getZ());
@@ -429,41 +414,38 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         IBlockData var5 = var0.getType(var4);
         Block var6 = var5.getBlock();
         Material var7 = var5.getMaterial();
-        if (var5.isAir()) {
+        if (var5.isAir())
             return PathType.OPEN;
-        } else if (!var6.a(TagsBlock.TRAPDOORS) && var6 != Blocks.LILY_PAD) {
-            if (var6 == Blocks.FIRE) {
+        else if (!var6.a(TagsBlock.TRAPDOORS) && var6 != Blocks.LILY_PAD) {
+            if (var6 == Blocks.FIRE)
                 return PathType.DAMAGE_FIRE;
-            } else if (var6 == Blocks.CACTUS) {
+            else if (var6 == Blocks.CACTUS)
                 return PathType.DAMAGE_CACTUS;
-            } else if (var6 == Blocks.SWEET_BERRY_BUSH) {
+            else if (var6 == Blocks.SWEET_BERRY_BUSH)
                 return PathType.DAMAGE_OTHER;
-            } else if (var6 instanceof BlockDoor && var7 == Material.WOOD && !(Boolean) var5.get(BlockDoor.OPEN)) {
+            else if (var6 instanceof BlockDoor && var7 == Material.WOOD && !(Boolean) var5.get(BlockDoor.OPEN))
                 return PathType.DOOR_WOOD_CLOSED;
-            } else if (var6 instanceof BlockDoor && var7 == Material.ORE && !(Boolean) var5.get(BlockDoor.OPEN)) {
+            else if (var6 instanceof BlockDoor && var7 == Material.ORE && !(Boolean) var5.get(BlockDoor.OPEN))
                 return PathType.DOOR_IRON_CLOSED;
-            } else if (var6 instanceof BlockDoor && var5.get(BlockDoor.OPEN)) {
+            else if (var6 instanceof BlockDoor && var5.get(BlockDoor.OPEN))
                 return PathType.DOOR_OPEN;
-            } else if (var6 instanceof BlockMinecartTrackAbstract) {
+            else if (var6 instanceof BlockMinecartTrackAbstract)
                 return PathType.RAIL;
-            } else if (var6 instanceof BlockLeaves) {
+            else if (var6 instanceof BlockLeaves)
                 return PathType.LEAVES;
-            } else if (!var6.a(TagsBlock.FENCES) && !var6.a(TagsBlock.WALLS)
+            else if (!var6.a(TagsBlock.FENCES) && !var6.a(TagsBlock.WALLS)
                     && (!(var6 instanceof BlockFenceGate) || var5.get(BlockFenceGate.OPEN))) {
                 Fluid var8 = var0.getFluid(var4);
-                if (var8.a(TagsFluid.WATER)) {
+                if (var8.a(TagsFluid.WATER))
                     return PathType.WATER;
-                } else if (var8.a(TagsFluid.LAVA)) {
+                else if (var8.a(TagsFluid.LAVA))
                     return PathType.LAVA;
-                } else {
+                else
                     return var5.a(var0, var4, PathMode.LAND) ? PathType.OPEN : PathType.BLOCKED;
-                }
-            } else {
+            } else
                 return PathType.FENCE;
-            }
-        } else {
+        } else
             return PathType.TRAPDOOR;
-        }
     }
 
     public static double a(IBlockAccess var0, BlockPosition var1) {
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 af40cda75..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
@@ -65,9 +65,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -76,9 +75,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 12aff9c2c..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
@@ -68,15 +68,14 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -178,9 +177,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 f100f817e..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
@@ -65,15 +65,14 @@ public class BeeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -175,9 +174,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 b6cbd49fa..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
@@ -65,15 +65,14 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -170,9 +169,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 612c6bff6..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
@@ -84,23 +84,21 @@ public class CatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -193,11 +191,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 27e7b3791..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
@@ -74,23 +74,21 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -183,11 +181,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -206,9 +203,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 a82b441d0..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
@@ -84,23 +84,21 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -193,11 +191,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 9492646b5..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
@@ -86,7 +86,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -95,25 +95,22 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -139,8 +136,9 @@ public class CodController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,11 +205,10 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -253,9 +250,8 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 d513bc38f..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
@@ -88,7 +88,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -97,25 +97,22 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -208,11 +205,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -231,9 +227,8 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 96cd25528..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
@@ -77,23 +77,21 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -119,8 +117,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -192,11 +191,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -215,9 +213,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 642c0b07e..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
@@ -87,7 +87,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -98,17 +98,15 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -134,8 +132,9 @@ public class DolphinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,11 +201,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 0db8dc92c..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
@@ -74,23 +74,21 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -116,8 +114,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -182,11 +181,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -205,9 +203,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 a579df93d..63312f700 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
@@ -71,15 +71,14 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -105,8 +104,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -257,9 +257,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 75f56653a..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
@@ -74,31 +74,28 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean a(double d1, double d2, double d3, boolean b) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(d1, d2, d3, b);
-            }
             return false;
         }
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -124,8 +121,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -190,11 +188,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -213,9 +210,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 7474241c9..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
@@ -74,23 +74,21 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -116,8 +114,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -182,11 +181,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -205,9 +203,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 149dff3d3..f98ef312f 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
@@ -99,9 +99,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && playerlistTracker == null) {
+        if (npc != null && playerlistTracker == null)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -115,9 +114,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean b(float f, float f1) {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.b(f, f1);
-        }
         return false;
     }
 
@@ -139,12 +137,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -163,12 +156,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             return;
 
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                ((WorldServer) world).removeEntity(EntityHumanNPC.this);
-            }
-        }, 15); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) () -> ((WorldServer) world).removeEntity(EntityHumanNPC.this), 15); // give enough time for death and smoke animation
     }
 
     @Override
@@ -207,9 +195,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public IChatBaseComponent getPlayerListName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new ChatComponentText("");
-        }
         return super.getPlayerListName();
     }
 
@@ -247,9 +234,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -279,11 +265,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean isClimbing() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.isClimbing();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -426,7 +411,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
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 b9e5dec19..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
@@ -68,23 +68,21 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -177,11 +175,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +197,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 6b317941c..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
@@ -78,23 +78,21 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +185,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 6d2398815..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
@@ -59,15 +59,14 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -170,9 +169,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 d173984b5..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
@@ -68,23 +68,21 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 6d21e024f..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
@@ -68,23 +68,21 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -177,11 +175,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -206,9 +203,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 9c2c5df6b..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
@@ -68,23 +68,21 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -177,11 +175,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -206,9 +203,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 0326a91f0..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
@@ -97,23 +97,21 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -136,9 +134,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean cj() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cj();
         }
 
@@ -219,11 +216,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 2051a23f2..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
@@ -59,6 +59,7 @@ public class HorseDonkeyController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseDonkeyNPC(EntityTypes<? extends EntityHorseDonkey> types, World world) {
             this(types, world, null);
         }
@@ -95,23 +96,21 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -134,9 +133,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean cj() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cj();
         }
 
@@ -217,11 +215,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -255,9 +252,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 d9d4876a4..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
@@ -96,23 +96,21 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -135,9 +133,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean cj() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cj();
         }
 
@@ -218,11 +215,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -256,9 +252,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 71caf8605..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
@@ -97,23 +97,21 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -136,9 +134,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean cj() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cj();
         }
 
@@ -219,11 +216,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 1117ebc03..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
@@ -97,23 +97,21 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -136,9 +134,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean cj() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cj();
         }
 
@@ -219,11 +216,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 095805684..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_15_R1.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 c3c5f3c81..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
@@ -68,23 +68,21 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -177,11 +175,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +197,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 4e81ba050..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
@@ -68,23 +68,21 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 b6620cdae..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
@@ -59,6 +59,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityTypes<? extends EntityLlama> types, World world) {
             this(types, world, null);
         }
@@ -95,23 +96,21 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -134,9 +133,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean cj() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cj();
         }
 
@@ -212,11 +210,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -250,9 +247,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 af983f748..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
@@ -78,23 +78,21 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -120,8 +118,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -186,11 +185,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +198,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 872d01002..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
@@ -84,7 +84,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_15_R1.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 812ecd59b..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
@@ -80,7 +80,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -93,17 +93,15 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -129,8 +127,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -195,11 +194,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +216,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 b13c3b7b9..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
@@ -79,23 +79,21 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -188,11 +186,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 77c758b0f..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
@@ -78,23 +78,21 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +185,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 60b6354a1..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
@@ -61,24 +61,22 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(EntityHuman paramEntityHuman, EnumHand paramEnumHand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.a(paramEntityHuman, paramEnumHand);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -180,9 +178,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 dd832b14f..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
@@ -82,23 +82,21 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -124,8 +122,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -197,11 +196,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -236,9 +234,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 4a7857783..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
@@ -79,23 +79,21 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -194,11 +192,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -217,9 +214,8 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 7406c62a6..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
@@ -68,23 +68,21 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 88bf4503f..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
@@ -78,23 +78,21 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +185,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 97a2c8a5b..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
@@ -69,15 +69,14 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -175,9 +174,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 9249222d4..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
@@ -83,7 +83,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,33 +92,29 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
         @Override
         public EntitySize a(EntityPose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entitypose);
-            }
             return super.a(entitypose).a(1 / s(getPuffState())).a(0.5F);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -213,11 +209,10 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +252,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 51c088161..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
@@ -79,23 +79,21 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -193,11 +191,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 3c3b03494..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
@@ -78,23 +78,21 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +185,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 3c0a5165a..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
@@ -80,7 +80,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,25 +89,22 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -133,8 +130,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -201,11 +199,10 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -245,9 +242,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 3afbc835c..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
@@ -78,23 +78,21 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -120,8 +118,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -186,11 +185,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -209,9 +207,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 5a71cb602..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
@@ -69,23 +69,21 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -111,8 +109,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -177,11 +176,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -198,9 +196,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 2549dab0a..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
@@ -68,23 +68,21 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 7f341d50c..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
@@ -68,23 +68,21 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 4de57e970..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
@@ -68,23 +68,21 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 92a43e51f..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
@@ -68,23 +68,21 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 b44d80204..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
@@ -78,23 +78,21 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +185,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -201,9 +198,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 aec372d22..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
@@ -68,23 +68,21 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 682467b45..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
@@ -68,23 +68,21 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 8494dca61..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
@@ -68,23 +68,21 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 68edc812a..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
@@ -92,23 +92,21 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -201,11 +199,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -235,9 +232,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 0ff063bea..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
@@ -80,7 +80,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,25 +89,22 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.a(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return false;
-            }
             return super.a(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -133,8 +130,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -201,11 +199,10 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -247,9 +244,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 a943957cc..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
@@ -82,23 +82,21 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -124,8 +122,9 @@ public class TurtleController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -192,11 +191,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +221,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 62ac47295..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
@@ -62,15 +62,14 @@ public class VexController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -168,9 +167,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 0d4f4f40e..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
@@ -90,7 +90,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -108,17 +108,15 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -220,11 +218,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -245,9 +242,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 c30c2636b..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
@@ -78,23 +78,21 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -187,11 +185,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 049921d93..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
@@ -89,7 +89,7 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -107,17 +107,15 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -223,11 +221,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 44f5a5957..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
@@ -67,23 +67,21 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -109,8 +107,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -175,11 +174,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -198,9 +196,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 3bea9bbc2..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
@@ -59,15 +59,14 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -93,8 +92,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -179,9 +179,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 d408ba2ed..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
@@ -80,23 +80,21 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -189,11 +187,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -212,9 +209,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 6c6061736..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
@@ -68,23 +68,21 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 ac3d801ea..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
@@ -68,23 +68,21 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 8548fafc3..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
@@ -68,23 +68,21 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -110,8 +108,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 cf09a93be..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
@@ -60,9 +60,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 774b0434e..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
@@ -73,9 +73,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -128,7 +127,7 @@ public class BoatController extends MobEntityController {
         private EnumStatus s() {
             EnumStatus entityboat_enumstatus = v();
             if (entityboat_enumstatus != null) {
-                this.aD = (getBoundingBox()).maxY;
+                this.aD = getBoundingBox().maxY;
                 return entityboat_enumstatus;
             }
             if (u())
@@ -152,7 +151,7 @@ public class BoatController extends MobEntityController {
                 this.aq = 0.05F;
                 if (this.aG == EnumStatus.IN_AIR && this.aF != EnumStatus.IN_AIR && this.aF != EnumStatus.ON_LAND) {
                     this.aD = e(1.0D);
-                    setPosition(locX(), (k() - getHeight()) + 0.101D, locZ());
+                    setPosition(locX(), k() - getHeight() + 0.101D, locZ());
                     setMot(getMot().d(1.0D, 0.0D, 1.0D));
                     this.aF = EnumStatus.IN_WATER;
                 } else {
@@ -169,8 +168,9 @@ public class BoatController extends MobEntityController {
                         this.aq = 0.9F;
                     } else if (this.aF == EnumStatus.ON_LAND) {
                         this.aq = this.aE;
-                        if (getRidingPassenger() instanceof EntityHuman)
+                        if (getRidingPassenger() instanceof EntityHuman) {
                             this.aE /= 2.0F;
+                        }
                     }
                     Vec3D vec3d = getMot();
                     setMot(vec3d.x * this.aq, vec3d.y + d1, vec3d.z * this.aq);
@@ -211,7 +211,7 @@ public class BoatController extends MobEntityController {
                             if (fluid.a(TagsFluid.WATER)) {
                                 float f = l1 + fluid.getHeight(this.world, blockposition_pooledblockposition);
                                 this.aD = Math.max(f, this.aD);
-                                m = flag | ((axisalignedbb.minY < f) ? true : false);
+                                m = flag | (axisalignedbb.minY < f ? true : false);
                             }
                         }
                     }
@@ -261,8 +261,8 @@ public class BoatController extends MobEntityController {
                         for (int i2 = i1; i2 < j1; i2++) {
                             blockposition_pooledblockposition.d(k1, l1, i2);
                             Fluid fluid = this.world.getFluid(blockposition_pooledblockposition);
-                            if (fluid.a(TagsFluid.WATER) && d0 < (blockposition_pooledblockposition.getY()
-                                    + fluid.getHeight(this.world, blockposition_pooledblockposition))) {
+                            if (fluid.a(TagsFluid.WATER) && d0 < blockposition_pooledblockposition.getY()
+                                    + fluid.getHeight(this.world, blockposition_pooledblockposition)) {
                                 if (!fluid.isSource()) {
                                     EnumStatus entityboat_enumstatus = EnumStatus.UNDER_FLOWING_WATER;
                                     return entityboat_enumstatus;
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 95788292d..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
@@ -60,9 +60,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 575315dad..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
@@ -76,9 +76,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 8d183a664..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
@@ -60,9 +60,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 64ef73b90..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
@@ -60,9 +60,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 bcb4d86e8..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
@@ -60,9 +60,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 8bab5e373..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
@@ -59,9 +59,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -70,9 +69,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 b428dde87..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
@@ -54,9 +54,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 5fcb9f69f..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
@@ -75,9 +75,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 46b0d44a0..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
@@ -54,9 +54,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 316f8d007..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
@@ -68,9 +68,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
@@ -123,9 +122,8 @@ public class FishingHookController extends MobEntityController {
         @Override
         public double h(Entity entity) {
             // distance check in k()
-            if (entity == this.owner) {
+            if (entity == this.owner)
                 return 0D;
-            }
             return super.h(entity);
         }
 
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 1c1af7c76..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
@@ -66,9 +66,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 f7064c9dc..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
@@ -66,9 +66,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 5576b9df5..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
@@ -54,9 +54,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 4fc40c90e..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
@@ -54,9 +54,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 d16bcad9f..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
@@ -73,9 +73,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 6901374f9..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
@@ -54,9 +54,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 22c1857bf..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
@@ -54,9 +54,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 192f0d124..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
@@ -54,9 +54,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 f52ab9ca2..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
@@ -49,9 +49,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 c11215669..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
@@ -54,9 +54,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 aee9df7a7..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
@@ -49,9 +49,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 512bea622..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
@@ -49,9 +49,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 d1a33efc9..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
@@ -54,9 +54,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 225123ab7..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
@@ -54,9 +54,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 2aa29bffd..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
@@ -54,9 +54,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 ca61fbb93..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
@@ -54,9 +54,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 e112fdd66..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
@@ -54,9 +54,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 f16ad6f87..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
@@ -54,9 +54,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 3d90d60b9..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
@@ -54,9 +54,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 e2bd9df15..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
@@ -55,9 +55,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 c7a0c436e..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
@@ -54,9 +54,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 a713e8137..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
@@ -54,9 +54,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 16d401848..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
@@ -54,9 +54,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean b(Tag<FluidType> tag) {
-            if (npc == null) {
+            if (npc == null)
                 return super.b(tag);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.b(tag);
             if (!npc.isPushableByFluids()) {
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 cdd7d4512..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
@@ -38,13 +38,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.getBlock().a(block, null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.canDestroySpecialBlock(block) : false;
         }
@@ -67,7 +67,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CustomEntityRegistry.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CustomEntityRegistry.java
index cea59b8dd..532338abf 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CustomEntityRegistry.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CustomEntityRegistry.java
@@ -27,9 +27,8 @@ public class CustomEntityRegistry extends RegistryBlocks implements Supplier<Reg
 
     @Override
     public int a(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.a((EntityTypes) key);
     }
 
@@ -62,25 +61,22 @@ public class CustomEntityRegistry extends RegistryBlocks implements Supplier<Reg
 
     @Override
     public EntityTypes get(MinecraftKey key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
     @Override
     public MinecraftKey getKey(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey((EntityTypes) value);
     }
 
     @Override
     public Optional getOptional(MinecraftKey var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return this.wrapped.getOptional(var0);
     }
 
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 9aaf066b0..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
@@ -491,9 +491,8 @@ public class NMSImpl implements NMSBridge {
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer()
                 .getMinecraftSessionService();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -527,17 +526,15 @@ public class NMSImpl implements NMSBridge {
                 bserver = ((EntityWither) NMSImpl.getHandle(entity)).bossBattle;
             } else if (entity.getType() == EntityType.ENDER_DRAGON) {
                 Object battleObject = ENDERDRAGON_BATTLE_FIELD.invoke(NMSImpl.getHandle(entity));
-                if (battleObject == null) {
+                if (battleObject == null)
                     return null;
-                }
                 bserver = ((EnderDragonBattle) battleObject).bossBattle;
             }
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -564,9 +561,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.b()) {
+        if (controller == null || !controller.b())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -577,9 +573,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aK;
     }
 
@@ -640,7 +635,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -652,9 +647,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_PROFILE_FIELD == null) {
             SKULL_PROFILE_FIELD = NMS.getField(meta.getClass(), "profile", false);
-            if (SKULL_PROFILE_FIELD == null) {
+            if (SKULL_PROFILE_FIELD == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
@@ -686,8 +680,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -706,23 +700,14 @@ public class NMSImpl implements NMSBridge {
         PathPoint last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final PathEntity path = new PathEntity(list, last != null ? new BlockPosition(last.a, last.b, last.c) : null,
                 true);
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -828,11 +813,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -1011,7 +995,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1022,8 +1006,9 @@ public class NMSImpl implements NMSBridge {
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY))
                     - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -1054,7 +1039,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1103,8 +1088,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(access.getLocation(),
@@ -1115,8 +1098,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.getBukkitView().setItem(0, anvil.getItem(0));
@@ -1159,8 +1142,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             EntityTypes<?> type = ENTITY_REGISTRY.findType(search);
             MinecraftKey key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1440,9 +1424,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SET_PROFILE_METHOD == null) {
             SET_PROFILE_METHOD = NMS.getMethodHandle(meta.getClass(), "setProfile", true, GameProfile.class);
-            if (SET_PROFILE_METHOD == null) {
+            if (SET_PROFILE_METHOD == null)
                 return;
-            }
         }
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
@@ -1738,9 +1721,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1828,9 +1810,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_15_R1.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1839,25 +1820,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_15_R1.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_15_R1.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_15_R1.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_15_R1.NBTTagInt) base).asInt());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_15_R1.NBTTagFloat) base).asFloat());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_15_R1.NBTTagDouble) base).asDouble());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_15_R1.NBTTagLong) base).asLong());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_15_R1.NBTTagShort) base).asShort());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_15_R1.NBTTagByte) base).asByte());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_15_R1.NBTTagByteArray) base).getBytes());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_15_R1.NBTTagIntArray) base).getInts());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagString)
             return new StringTag(key, base.asString());
-        } else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_15_R1.NBTTagList) {
             List<net.minecraft.server.v1_15_R1.NBTBase> list = (List<net.minecraft.server.v1_15_R1.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1867,12 +1848,10 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
@@ -1925,7 +1904,7 @@ public class NMSImpl implements NMSBridge {
                         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;
+                        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) {
@@ -1965,7 +1944,7 @@ public class NMSImpl implements NMSBridge {
                     entity.move(EnumMoveType.SELF, entity.getMot());
                     vec3d2 = entity.getMot();
                     try {
-                        if ((entity.positionChanged || ((boolean) JUMP_FIELD.invoke(entity))) && entity.isClimbing()) {
+                        if ((entity.positionChanged || (boolean) JUMP_FIELD.invoke(entity)) && entity.isClimbing()) {
                             vec3d2 = new Vec3D(vec3d2.x, 0.2D, vec3d2.z);
                         }
                     } catch (Throwable e) {
@@ -2124,9 +2103,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, EntityInsentient handle, Vec3D vec3d, float speed) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
             handle.a(speed > 0 ? speed : handle instanceof EntityTurtle ? 0.1F : 0.01F, vec3d);
             handle.move(EnumMoveType.SELF, handle.getMot());
@@ -2177,7 +2155,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2186,8 +2164,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
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 33a1c8bc2..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
@@ -56,7 +56,7 @@ public class PlayerControllerMove extends ControllerMove {
                 this.h = new Random().nextInt(20) + 10;
                 this.h /= 3;
                 ((EntityInsentient) this.a).getControllerJump().jump();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 if (this.a instanceof EntityHumanNPC) {
                     ((EntityHumanNPC) this.a).getControllerJump().jump();
                 } else {
@@ -85,9 +85,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (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 2ef4092db..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,17 +88,16 @@ 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) {
+            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()) {
+        if (!this.b.getType(var0).getMaterial().isBuildable())
             return supera(var0, var1);
-        } else {
+        else {
             for (var2 = var0.up(); var2.getY() < this.b.getBuildHeight()
                     && this.b.getType(var2).getMaterial().isBuildable(); var2 = var2.up()) {
             }
@@ -145,27 +144,24 @@ public class PlayerNavigation extends NavigationAbstract {
             double var9) {
         int var11 = var0 - var3 / 2;
         int var12 = var2 - var5 / 2;
-        if (!this.b(var11, var1, var12, var3, var4, var5, var6, var7, var9)) {
+        if (!this.b(var11, var1, var12, var3, var4, var5, var6, var7, var9))
             return false;
-        } else {
+        else {
             for (int var13 = var11; var13 < var11 + var3; ++var13) {
                 for (int var14 = var12; var14 < var12 + var5; ++var14) {
                     double var15 = var13 + 0.5D - var6.x;
                     double var17 = var14 + 0.5D - var6.z;
                     if (var15 * var7 + var17 * var9 >= 0.0D) {
                         PathType var19 = this.o.a(this.b, var13, var1 - 1, var14, this.a, var3, var4, var5, true, true);
-                        if ((var19 == PathType.WATER) || (var19 == PathType.LAVA) || (var19 == PathType.OPEN)) {
+                        if (var19 == PathType.WATER || var19 == PathType.LAVA || var19 == PathType.OPEN)
                             return false;
-                        }
                         var19 = this.o.a(this.b, var13, var1, var14, this.a, var3, var4, var5, true, true);
                         float var20 = this.a.a(var19);
-                        if (var20 < 0.0F || var20 >= 8.0F) {
+                        if (var20 < 0.0F || var20 >= 8.0F)
                             return false;
-                        }
                         if (var19 == PathType.DAMAGE_FIRE || var19 == PathType.DANGER_FIRE
-                                || var19 == PathType.DAMAGE_OTHER) {
+                                || var19 == PathType.DAMAGE_OTHER)
                             return false;
-                        }
                     }
                 }
             }
@@ -182,13 +178,13 @@ public class PlayerNavigation extends NavigationAbstract {
             if (!var0.a(this.c)) {
                 this.c = var0;
             }
-            if (this.m()) {
+            if (this.m())
                 return false;
-            } else {
+            else {
                 this.F_();
-                if (this.c.e() <= 0) {
+                if (this.c.e() <= 0)
                     return false;
-                } else {
+                else {
                     this.d = var1;
                     Vec3D var3 = this.b();
                     this.f = this.e;
@@ -201,18 +197,14 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected PathEntity a(Set var0, int var1, boolean var2, int var3) {
-        if (var0.isEmpty()) {
+        if (var0.isEmpty() || (this.a.locY() < 0.0D) || !this.a())
             return null;
-        } else if (this.a.locY() < 0.0D) {
-            return null;
-        } else if (!this.a()) {
-            return null;
-        } else if (this.c != null && !this.c.b() && var0.contains(this.q)) {
+        else if (this.c != null && !this.c.b() && var0.contains(this.q))
             return this.c;
-        } else {
+        else {
             this.b.getMethodProfiler().enter("pathfind");
             float var4 = (float) this.p.getValue();
-            BlockPosition var5 = var2 ? (new BlockPosition(this.a)).up() : new BlockPosition(this.a);
+            BlockPosition var5 = var2 ? new BlockPosition(this.a).up() : new BlockPosition(this.a);
             int var6 = (int) (var4 + var1);
             ChunkCache var7 = new ChunkCache(this.b, var5.b(-var6, -var6, -var6), var5.b(var6, var6, var6));
             PathEntity var8 = this.t.a(var7, this.a, var0, var4, var3, this.s);
@@ -265,17 +257,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double var7 = var1.x - var0.x;
         double var9 = var1.z - var0.z;
         double var11 = var7 * var7 + var9 * var9;
-        if (var11 < 1.0E-8D) {
+        if (var11 < 1.0E-8D)
             return false;
-        } else {
+        else {
             double var13 = 1.0D / Math.sqrt(var11);
             var7 *= var13;
             var9 *= var13;
             var2 += 2;
             var4 += 2;
             if (!this.a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9)) {
-                return false;
-            } else {
                 var2 -= 2;
                 var4 -= 2;
                 double var15 = 1.0D / Math.abs(var7);
@@ -297,9 +287,8 @@ public class PlayerNavigation extends NavigationAbstract {
                 int var27 = var25 - var5;
                 int var28 = var26 - var6;
                 do {
-                    if (var27 * var23 <= 0 && var28 * var24 <= 0) {
+                    if (var27 * var23 <= 0 && var28 * var24 <= 0)
                         return true;
-                    }
                     if (var19 < var21) {
                         var19 += var15;
                         var5 += var23;
@@ -310,8 +299,8 @@ public class PlayerNavigation extends NavigationAbstract {
                         var28 = var26 - var6;
                     }
                 } while (this.a(var5, MathHelper.floor(var0.y), var6, var2, var3, var4, var0, var7, var9));
-                return false;
             }
+            return false;
         }
     }
 
@@ -340,9 +329,8 @@ public class PlayerNavigation extends NavigationAbstract {
         double var15;
         BlockPosition var11;
         do {
-            if (!var12.hasNext()) {
+            if (!var12.hasNext())
                 return true;
-            }
             var11 = (BlockPosition) var12.next();
             var13 = var11.getX() + 0.5D - var6.x;
             var15 = var11.getZ() + 0.5D - var6.z;
@@ -395,9 +383,8 @@ public class PlayerNavigation extends NavigationAbstract {
     protected void F_() {
         superF_();
         if (this.pp) {
-            if (this.b.f(new BlockPosition(this.a.locX(), this.a.locY() + 0.5D, this.a.locZ()))) {
+            if (this.b.f(new BlockPosition(this.a.locX(), this.a.locY() + 0.5D, this.a.locZ())))
                 return;
-            }
             for (int var0 = 0; var0 < this.c.e(); ++var0) {
                 PathPoint var1 = this.c.a(var0);
                 if (this.b.f(new BlockPosition(var1.a, var1.b, var1.c))) {
@@ -515,17 +502,15 @@ public class PlayerNavigation extends NavigationAbstract {
             Block var1 = this.b.getType(new BlockPosition(this.a.locX(), var0, this.a.locZ())).getBlock();
             int var2 = 0;
             do {
-                if (var1 != Blocks.WATER) {
+                if (var1 != Blocks.WATER)
                     return var0;
-                }
                 ++var0;
                 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 {
+        } 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 d62c49cd7..54a78bbd2 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
@@ -42,9 +42,7 @@ public class PlayerPathfinder extends Pathfinder {
         this.a.a();
         this.e.a(var0, var1);
         PathPoint var6 = this.e.b();
-        Map<PathDestination, BlockPosition> var7 = var2.stream().collect(Collectors.toMap((var0x) -> {
-            return this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ());
-        }, Function.identity()));
+        Map<PathDestination, BlockPosition> var7 = var2.stream().collect(Collectors.toMap(var0x -> this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ()), Function.identity()));
         PathEntity var8 = this.a(var6, var7, var3, var4, var5);
         this.e.a();
         return var8;
@@ -56,9 +54,7 @@ public class PlayerPathfinder extends Pathfinder {
         this.a.a();
         this.e.a(var0, var1);
         PathPoint var6 = this.e.b();
-        Map<PathDestination, BlockPosition> var7 = var2.stream().collect(Collectors.toMap((var0x) -> {
-            return this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ());
-        }, Function.identity()));
+        Map<PathDestination, BlockPosition> var7 = var2.stream().collect(Collectors.toMap(var0x -> this.e.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ()), Function.identity()));
         PathEntity var8 = this.a(var6, var7, var3, var4, var5);
         this.e.a();
         return var8;
@@ -92,9 +88,7 @@ public class PlayerPathfinder extends Pathfinder {
             }
             PathPoint var8 = this.a.c();
             var8.i = true;
-            var5.stream().filter((var2x) -> {
-                return var8.c(var2x) <= var3;
-            }).forEach(PathDestination::e);
+            var5.stream().filter(var2x -> (var8.c(var2x) <= var3)).forEach(PathDestination::e);
             if (var5.stream().anyMatch(PathDestination::f)) {
                 break;
             }
@@ -121,16 +115,14 @@ public class PlayerPathfinder extends Pathfinder {
         }
         Stream var8;
         if (var5.stream().anyMatch(PathDestination::f)) {
-            var8 = var5.stream().filter(PathDestination::f).map((var1x) -> {
-                return this.a(var1x.d(), var1.get(var1x), true);
-            }).sorted(Comparator.comparingInt(PathEntity::e));
+            var8 = var5.stream().filter(PathDestination::f).map(var1x -> this.a(var1x.d(), var1.get(var1x), true)).sorted(Comparator.comparingInt(PathEntity::e));
         } else {
             var8 = getFallbackDestinations(var1, var5);
         }
         Optional var9 = var8.findFirst();
-        if (!var9.isPresent()) {
+        if (!var9.isPresent())
             return null;
-        } else {
+        else {
             PathEntity var10 = (PathEntity) var9.get();
             return var10;
         }
@@ -149,11 +141,8 @@ public class PlayerPathfinder extends Pathfinder {
 
     public Stream<PathEntity> getFallbackDestinations(Map<PathDestination, BlockPosition> var1,
             Set<PathDestination> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.a(var1x.d(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(PathEntity::l).thenComparingInt(PathEntity::e));
+        return var5.stream().map(var1x -> this.a(var1x.d(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(PathEntity::l).thenComparingInt(PathEntity::e));
     }
 }
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderAbstract.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderAbstract.java
index 468bee271..8f78f9309 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderAbstract.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerPathfinderAbstract.java
@@ -42,9 +42,7 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
 
     @Override
     protected PathPoint a(int var0, int var1, int var2) {
-        return (PathPoint) this.c.computeIfAbsent(PathPoint.b(var0, var1, var2), (var3) -> {
-            return new PathPoint(var0, var1, var2);
-        });
+        return (PathPoint) this.c.computeIfAbsent(PathPoint.b(var0, var1, var2), var3 -> new PathPoint(var0, var1, var2));
     }
 
     @Override
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 2ad16383e..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
@@ -96,25 +96,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         double var12 = var4.getWidth() / 2.0D;
         BlockPosition var14 = new BlockPosition(var4);
         var11 = this.a(var0, var1, var2, var3, var5, var6, var7, var8, var9, var10, var11, var14);
-        if (var10.contains(PathType.FENCE)) {
+        if (var10.contains(PathType.FENCE))
             return PathType.FENCE;
-        } else {
+        else {
             PathType var15 = PathType.BLOCKED;
             Iterator<PathType> var17 = var10.iterator();
             while (var17.hasNext()) {
                 PathType var18 = var17.next();
-                if (var4.a(var18) < 0.0F) {
+                if (var4.a(var18) < 0.0F)
                     return var18;
-                }
                 if (var4.a(var18) >= var4.a(var15)) {
                     var15 = var18;
                 }
             }
-            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F) {
+            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
-            } else {
+            else
                 return var15;
-            }
         }
     }
 
@@ -126,25 +124,23 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         double var12 = var4.getWidth() / 2.0D;
         BlockPosition var14 = new BlockPosition(var4);
         var11 = this.a(var0, var1, var2, var3, var5, var6, var7, var8, var9, var10, var11, var14);
-        if (var10.contains(PathType.FENCE)) {
+        if (var10.contains(PathType.FENCE))
             return PathType.FENCE;
-        } else {
+        else {
             PathType var15 = PathType.BLOCKED;
             Iterator<PathType> var17 = var10.iterator();
             while (var17.hasNext()) {
                 PathType var18 = var17.next();
-                if (var4.a(var18) < 0.0F) {
+                if (var4.a(var18) < 0.0F)
                     return var18;
-                }
                 if (var4.a(var18) >= var4.a(var15)) {
                     var15 = var18;
                 }
             }
-            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F) {
+            if (var11 == PathType.OPEN && var4.a(var15) == 0.0F)
                 return PathType.OPEN;
-            } else {
+            else
                 return var15;
-            }
         }
     }
 
@@ -172,9 +168,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         PathPoint var7 = null;
         BlockPosition var8 = new BlockPosition(var0, var1, var2);
         double var9 = a(this.a, var8);
-        if (var9 - var4 > 1.125D) {
+        if (var9 - var4 > 1.125D)
             return null;
-        } else {
+        else {
             PathType var11 = this.a(this.b, var0, var1, var2);
             float var12 = this.b.a(var11);
             double var13 = this.b.getWidth() / 2.0D;
@@ -183,9 +179,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var7.l = var11;
                 var7.k = Math.max(var7.k, var12);
             }
-            if (var11 == PathType.WALKABLE) {
-                return var7;
-            } else {
+            if ((var11 != PathType.WALKABLE)) {
                 if ((var7 == null || var7.k < 0.0F) && var3 > 0 && var11 != PathType.FENCE
                         && var11 != PathType.TRAPDOOR) {
                     var7 = this.a(var0, var1 + 1, var2, var3 - 1, var4, var6);
@@ -194,9 +188,9 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         double var15 = var0 - var6.getAdjacentX() + 0.5D;
                         double var17 = var2 - var6.getAdjacentZ() + 0.5D;
                         AxisAlignedBB var19 = new AxisAlignedBB(var15 - var13,
-                                a(this.a, (new BlockPosition(var15, var1 + 1, var17))) + 0.001D, var17 - var13,
+                                a(this.a, new BlockPosition(var15, var1 + 1, var17)) + 0.001D, var17 - var13,
                                 var15 + var13,
-                                this.b.getHeight() + a(this.a, (new BlockPosition(var7.a, var7.b, var7.c))) - 0.002D,
+                                this.b.getHeight() + a(this.a, new BlockPosition(var7.a, var7.b, var7.c)) - 0.002D,
                                 var17 + var13);
                         if (!this.a.getCubes(this.b, var19)) {
                             var7 = null;
@@ -204,15 +198,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     }
                 }
                 if (var11 == PathType.WATER && !this.e()) {
-                    if (this.a(this.b, var0, var1 - 1, var2) != PathType.WATER) {
+                    if (this.a(this.b, var0, var1 - 1, var2) != PathType.WATER)
                         return var7;
-                    }
                     while (var1 > 0) {
                         --var1;
                         var11 = this.a(this.b, var0, var1, var2);
-                        if (var11 != PathType.WATER) {
+                        if (var11 != PathType.WATER)
                             return var7;
-                        }
                         var7 = this.a(var0, var1, var2);
                         var7.l = var11;
                         var7.k = Math.max(var7.k, this.b.a(var11));
@@ -221,9 +213,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 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);
-                    if (!this.a.getCubes(this.b, var15)) {
+                    if (!this.a.getCubes(this.b, var15))
                         return null;
-                    }
                     if (this.b.getWidth() >= 1.0F) {
                         PathType var16 = this.a(this.b, var0, var1 - 1, var2);
                         if (var16 == PathType.BLOCKED) {
@@ -265,23 +256,18 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                         }
                     }
                 }
-                return var7;
             }
+            return var7;
         }
     }
 
     private boolean a(PathPoint var0, PathPoint var1, PathPoint var2, PathPoint var3) {
-        if (var3 != null && var2 != null && var1 != null) {
-            if (var3.i) {
-                return false;
-            } else if (var2.b <= var0.b && var1.b <= var0.b) {
-                return var3.k >= 0.0F && (var2.b < var0.b || var2.k >= 0.0F) && (var1.b < var0.b || var1.k >= 0.0F);
-            } else {
-                return false;
-            }
-        } else {
+        if (((var3 == null) || (var2 == null) || (var1 == null)) || var3.i)
+            return false;
+        else if (var2.b <= var0.b && var1.b <= var0.b)
+            return var3.k >= 0.0F && (var2.b < var0.b || var2.k >= 0.0F) && (var1.b < var0.b || var1.k >= 0.0F);
+        else
             return false;
-        }
     }
 
     @Override
@@ -297,7 +283,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                 var3 = MathHelper.d(Math.max(1.0F, this.b.H));
             }
         }
-        double var5 = a(this.a, (new BlockPosition(var1.a, var1.b, var1.c)));
+        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;
@@ -367,9 +353,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             while (var5.hasNext()) {
                 BlockPosition varb = var5.next();
                 PathType var6 = this.a(this.b, varb);
-                if (this.b.a(var6) >= 0.0F) {
+                if (this.b.a(var6) >= 0.0F)
                     return this.a(varb.getX(), varb.getY(), varb.getZ());
-                }
             }
         }
         return this.a(var1.getX(), var0, var1.getZ());
@@ -454,44 +439,42 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         IBlockData var5 = var0.getType(var4);
         Block var6 = var5.getBlock();
         Material var7 = var5.getMaterial();
-        if (var5.isAir()) {
+        if (var5.isAir())
             return PathType.OPEN;
-        } else if (!var6.a(TagsBlock.TRAPDOORS) && var6 != Blocks.LILY_PAD) {
-            if (var6 == Blocks.FIRE) {
+        else if (!var6.a(TagsBlock.TRAPDOORS) && var6 != Blocks.LILY_PAD) {
+            if (var6 == Blocks.FIRE)
                 return PathType.DAMAGE_FIRE;
-            } else if (var6 == Blocks.CACTUS) {
+            else if (var6 == Blocks.CACTUS)
                 return PathType.DAMAGE_CACTUS;
-            } else if (var6 == Blocks.SWEET_BERRY_BUSH) {
+            else if (var6 == Blocks.SWEET_BERRY_BUSH)
                 return PathType.DAMAGE_OTHER;
-            } else if (var6 == Blocks.HONEY_BLOCK) {
+            else if (var6 == Blocks.HONEY_BLOCK)
                 return PathType.STICKY_HONEY;
-            } else if (var6 == Blocks.COCOA) {
+            else if (var6 == Blocks.COCOA)
                 return PathType.COCOA;
-            } else if (var6 instanceof BlockDoor && var7 == Material.WOOD && !(Boolean) var5.get(BlockDoor.OPEN)) {
+            else if (var6 instanceof BlockDoor && var7 == Material.WOOD && !(Boolean) var5.get(BlockDoor.OPEN))
                 return PathType.DOOR_WOOD_CLOSED;
-            } else if (var6 instanceof BlockDoor && var7 == Material.ORE && !(Boolean) var5.get(BlockDoor.OPEN)) {
+            else if (var6 instanceof BlockDoor && var7 == Material.ORE && !(Boolean) var5.get(BlockDoor.OPEN))
                 return PathType.DOOR_IRON_CLOSED;
-            } else if (var6 instanceof BlockDoor && var5.get(BlockDoor.OPEN)) {
+            else if (var6 instanceof BlockDoor && var5.get(BlockDoor.OPEN))
                 return PathType.DOOR_OPEN;
-            } else if (var6 instanceof BlockMinecartTrackAbstract) {
+            else if (var6 instanceof BlockMinecartTrackAbstract)
                 return PathType.RAIL;
-            } else if (var6 instanceof BlockLeaves) {
+            else if (var6 instanceof BlockLeaves)
                 return PathType.LEAVES;
-            } else if (var6.a(TagsBlock.FENCES) || var6.a(TagsBlock.WALLS)
-                    || var6 instanceof BlockFenceGate && !(Boolean) var5.get(BlockFenceGate.OPEN)) {
+            else if (var6.a(TagsBlock.FENCES) || var6.a(TagsBlock.WALLS)
+                    || var6 instanceof BlockFenceGate && !(Boolean) var5.get(BlockFenceGate.OPEN))
                 return PathType.FENCE;
-            } else {
+            else {
                 Fluid var8 = var0.getFluid(var4);
-                if (var8.a(TagsFluid.WATER)) {
+                if (var8.a(TagsFluid.WATER))
                     return PathType.WATER;
-                } else if (var8.a(TagsFluid.LAVA)) {
+                else if (var8.a(TagsFluid.LAVA))
                     return PathType.LAVA;
-                } else {
+                else
                     return var5.a(var0, var4, PathMode.LAND) ? PathType.OPEN : PathType.BLOCKED;
-                }
             }
-        } else {
+        } else
             return PathType.TRAPDOOR;
-        }
     }
 }
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 eb825656a..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
@@ -69,9 +69,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -80,9 +79,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 4554bb25f..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
@@ -68,15 +68,14 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -178,9 +177,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 5149e0274..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
@@ -65,15 +65,14 @@ public class BeeController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -175,9 +174,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 90539e4d6..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
@@ -65,15 +65,14 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -170,9 +169,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 1dde4bf8b..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
@@ -84,15 +84,14 @@ public class CatController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -103,9 +102,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -193,11 +191,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 2e9cca228..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
@@ -74,15 +74,14 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -93,9 +92,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -183,11 +181,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -206,9 +203,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 8d03b9af4..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
@@ -84,15 +84,14 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -103,9 +102,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -193,11 +191,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 8dd814e35..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
@@ -87,15 +87,14 @@ public class CodController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -109,17 +108,15 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.b(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return EnumInteractionResult.FAIL;
-            }
             return super.b(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -140,8 +137,9 @@ public class CodController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,11 +206,10 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 0aff8961a..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
@@ -89,15 +89,14 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -111,17 +110,15 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.b(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby())
                 return EnumInteractionResult.FAIL;
-            }
             return super.b(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -209,11 +206,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +228,8 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 72ce8e2a6..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
@@ -78,15 +78,14 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -120,8 +118,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -193,11 +192,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 b4624315e..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
@@ -87,15 +87,14 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -111,9 +110,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -134,8 +132,9 @@ public class DolphinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,11 +201,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 dbdbd0bbc..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
@@ -74,15 +74,14 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -93,9 +92,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -116,8 +114,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -182,11 +181,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -205,9 +203,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 73697a2b2..4659f3ded 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
@@ -71,15 +71,14 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -105,8 +104,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -258,9 +258,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 83df7a37b..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
@@ -74,23 +74,21 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean a(double d1, double d2, double d3, boolean b) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(d1, d2, d3, b);
-            }
             return false;
         }
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -101,9 +99,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -124,8 +121,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -190,11 +188,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -217,9 +214,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 528f9e1bb..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
@@ -74,15 +74,14 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -93,9 +92,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -116,8 +114,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -182,11 +181,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -205,9 +203,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 ff4c7bc87..609d07b60 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
@@ -95,17 +95,15 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && playerlistTracker == null) {
+        if (npc != null && playerlistTracker == null)
             return false;
-        }
         return super.a(entityplayer);
     }
 
     @Override
     public boolean b(float f, float f1) {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.b(f, f1);
-        }
         return false;
     }
 
@@ -127,12 +125,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         boolean damaged = super.damageEntity(damagesource, f);
         if (damaged && velocityChanged) {
             velocityChanged = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.velocityChanged = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.velocityChanged = true);
         }
         return damaged;
     }
@@ -151,12 +144,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
             return;
 
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                ((WorldServer) world).removeEntity(EntityHumanNPC.this);
-            }
-        }, 15); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) () -> ((WorldServer) world).removeEntity(EntityHumanNPC.this), 15); // give enough time for death and smoke animation
     }
 
     @Override
@@ -188,9 +176,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public IChatBaseComponent getPlayerListName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new ChatComponentText("");
-        }
         return super.getPlayerListName();
     }
 
@@ -228,9 +215,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -252,11 +238,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean isClimbing() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.isClimbing();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -396,7 +381,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (EnumItemSlot slot : EnumItemSlot.values()) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 if (cache != null && !cache.isEmpty()) {
                     this.getAttributeMap().a(cache.a(slot));
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 5033c278f..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
@@ -68,15 +68,14 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -177,11 +175,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +197,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 12897b833..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
@@ -78,15 +78,14 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -187,11 +185,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 3bb96dbdb..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
@@ -59,15 +59,14 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -170,9 +169,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 0f823b3dd..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
@@ -68,15 +68,14 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 b2c44fedb..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
@@ -68,15 +68,14 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -177,11 +175,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -206,9 +203,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 4b441a754..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
@@ -68,15 +68,14 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -177,11 +175,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -206,9 +203,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 50c6d406b..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
@@ -68,15 +68,14 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class HoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -202,9 +200,8 @@ public class HoglinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 805322299..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
@@ -97,15 +97,14 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -116,9 +115,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -146,9 +144,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean cs() { // horse boolean
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cs();
         }
 
@@ -219,11 +216,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 98f4d479d..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
@@ -59,6 +59,7 @@ public class HorseDonkeyController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseDonkeyNPC(EntityTypes<? extends EntityHorseDonkey> types, World world) {
             this(types, world, null);
         }
@@ -95,15 +96,14 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -114,9 +114,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -144,9 +143,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean cs() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cs();
         }
 
@@ -217,11 +215,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -255,9 +252,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 feadca506..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
@@ -96,15 +96,14 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -115,9 +114,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -145,9 +143,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean cs() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cs();
         }
 
@@ -218,11 +215,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -256,9 +252,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 2b9fc3a48..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
@@ -97,15 +97,14 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -116,9 +115,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -146,9 +144,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean cs() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cs();
         }
 
@@ -219,11 +216,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 b431f6129..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
@@ -97,15 +97,14 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -116,9 +115,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -146,9 +144,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean cs() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cs();
         }
 
@@ -219,11 +216,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 bce1972a1..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_16_R3.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 e3dd782c9..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
@@ -68,15 +68,14 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -177,11 +175,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +197,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 ce8d0100b..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
@@ -68,15 +68,14 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 d4031a17b..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
@@ -59,6 +59,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityTypes<? extends EntityLlama> types, World world) {
             this(types, world, null);
         }
@@ -95,15 +96,14 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -114,9 +114,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -144,9 +143,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean cs() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.cs();
         }
 
@@ -212,11 +210,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -250,9 +247,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 94c057cc8..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
@@ -78,15 +78,14 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -120,8 +118,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -186,11 +185,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +198,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 b8b29bb42..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
@@ -84,7 +84,7 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final MethodHandle UUID_FIELD = NMS.getSetter(net.minecraft.server.v1_16_R3.Entity.class,
             "uniqueID");
 }
\ No newline at end of file
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 5bc8fd428..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
@@ -81,15 +81,14 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -107,9 +106,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -130,8 +128,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -196,11 +195,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +217,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 c7980ef01..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
@@ -79,15 +79,14 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -98,9 +97,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -188,11 +186,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 1f44d2383..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
@@ -78,15 +78,14 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -187,11 +185,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 5e1370de9..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
@@ -62,15 +62,14 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -82,9 +81,8 @@ public class ParrotController extends MobEntityController {
         @Override
         public EnumInteractionResult b(EntityHuman paramEntityHuman, EnumHand paramEnumHand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.b(paramEntityHuman, paramEnumHand);
-            }
             return EnumInteractionResult.FAIL;
         }
 
@@ -181,9 +179,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 1078fe72d..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
@@ -92,15 +92,14 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -111,9 +110,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -134,8 +132,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,11 +206,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -246,9 +244,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 dc1bd1753..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
@@ -80,15 +80,14 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -99,9 +98,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -195,11 +193,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 5b1071189..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
@@ -68,15 +68,14 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 846a2ebaa..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
@@ -68,15 +68,14 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class PiglinBruteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -202,9 +200,8 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 342ce910a..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
@@ -68,15 +68,14 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class PiglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -202,9 +200,8 @@ public class PiglinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 c145c1a92..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
@@ -78,15 +78,14 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -187,11 +185,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 0126bee10..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
@@ -69,15 +69,14 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -175,9 +174,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 663f7febf..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
@@ -84,23 +84,21 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public EntitySize a(EntityPose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entitypose);
-            }
             return super.a(entitypose).a(1 / s(getPuffState())).a(0.5F);
         }
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -114,17 +112,15 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.b(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return EnumInteractionResult.FAIL;
-            }
             return super.b(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -214,11 +210,10 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -258,9 +253,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 17deea70b..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
@@ -79,15 +79,14 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -98,9 +97,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -193,11 +191,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 bd585348b..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
@@ -78,15 +78,14 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -187,11 +185,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 279476d0b..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
@@ -81,15 +81,14 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -103,17 +102,15 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.b(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return EnumInteractionResult.FAIL;
-            }
             return super.b(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -134,8 +131,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,11 +200,10 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -246,9 +243,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 734eba81d..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
@@ -78,15 +78,14 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -120,8 +118,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -186,11 +185,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -209,9 +207,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 8252f4dd4..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
@@ -69,15 +69,14 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -88,9 +87,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -111,8 +109,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -177,11 +176,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -198,9 +196,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 ef54fa11b..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
@@ -68,15 +68,14 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 61874ff0b..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
@@ -68,15 +68,14 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 799548022..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
@@ -68,15 +68,14 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 e5c5048af..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
@@ -68,15 +68,14 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 626ec4714..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
@@ -78,15 +78,14 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -187,11 +185,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -201,9 +198,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 e0e5e3e3c..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
@@ -68,15 +68,14 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 8dadd8d05..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
@@ -68,15 +68,14 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 e694a3b1f..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
@@ -68,15 +68,14 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 fc1c0b108..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
@@ -68,15 +68,14 @@ public class StriderController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class StriderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class StriderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 5cae7b934..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
@@ -92,15 +92,14 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -111,9 +110,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -201,11 +199,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -235,9 +232,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 c79f827dd..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
@@ -81,15 +81,14 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -103,17 +102,15 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.b(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.b(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return EnumInteractionResult.FAIL;
-            }
             return super.b(entityhuman, enumhand);
         }
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -134,8 +131,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,11 +200,10 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -248,9 +245,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 3b9099808..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
@@ -82,15 +82,14 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -101,9 +100,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -124,8 +122,9 @@ public class TurtleController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -192,11 +191,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +221,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 db0036af9..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
@@ -62,15 +62,14 @@ public class VexController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -168,9 +167,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 15574c283..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
@@ -92,15 +92,14 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -123,9 +122,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -222,11 +220,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -247,9 +244,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 f86b9f9c7..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
@@ -78,15 +78,14 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -97,9 +96,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -187,11 +185,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 32e4f6fc7..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
@@ -91,15 +91,14 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -122,9 +121,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -225,11 +223,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -256,9 +253,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 4a0bf073a..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
@@ -68,15 +68,14 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 f6d170ecd..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
@@ -59,15 +59,14 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -93,8 +92,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -173,9 +173,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 df783a92f..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
@@ -80,15 +80,14 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -99,9 +98,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -189,11 +187,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -212,9 +209,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
 
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 9b39778e0..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
@@ -68,15 +68,14 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class ZoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -201,9 +199,8 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 55d1cc960..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
@@ -68,15 +68,14 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 38f3e885e..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
@@ -68,15 +68,14 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 fd918b2d3..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
@@ -68,15 +68,14 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void a(float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -87,9 +86,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean b(float f, float f1) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.b(f, f1);
-            }
             return false;
         }
 
@@ -110,8 +108,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -176,11 +175,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean isClimbing() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.isClimbing();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean n(Entity entity) {
-            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract)) {
+            if (npc != null && (entity instanceof EntityBoat || entity instanceof EntityMinecartAbstract))
                 return !npc.isProtected();
-            }
             return super.n(entity);
         }
     }
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 e867298ad..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
@@ -60,9 +60,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 4f0b5dc3e..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
@@ -73,9 +73,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -120,7 +119,7 @@ public class BoatController extends MobEntityController {
         private EnumStatus getStatus() {
             EnumStatus entityboat_enumstatus = u();
             if (entityboat_enumstatus != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_enumstatus;
             }
             if (t())
@@ -161,7 +160,7 @@ public class BoatController extends MobEntityController {
                         if (fluid.a(TagsFluid.WATER)) {
                             float f = l1 + fluid.getHeight(this.world, blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -180,7 +179,7 @@ public class BoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == EnumStatus.IN_AIR && this.aE != EnumStatus.IN_AIR && this.aE != EnumStatus.ON_LAND) {
                     this.aC = e(1.0D);
-                    setPosition(locX(), (i() - getHeight()) + 0.101D, locZ());
+                    setPosition(locX(), i() - getHeight() + 0.101D, locZ());
                     setMot(getMot().d(1.0D, 0.0D, 1.0D));
                     this.aE = EnumStatus.IN_WATER;
                 } else {
@@ -206,7 +205,7 @@ public class BoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3D vec3d1 = getMot();
-                        setMot(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setMot(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(EnumMoveType.SELF, getMot());
@@ -234,8 +233,8 @@ public class BoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.d(k1, l1, i2);
                         Fluid fluid = this.world.getFluid(blockposition_mutableblockposition);
-                        if (fluid.a(TagsFluid.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.world, blockposition_mutableblockposition))) {
+                        if (fluid.a(TagsFluid.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.world, blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return EnumStatus.UNDER_FLOWING_WATER;
                             flag = true;
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 4e83437ea..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
@@ -60,9 +60,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 9b3903578..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
@@ -76,9 +76,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 fbd6f387c..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
@@ -60,9 +60,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 3a738e62b..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
@@ -60,9 +60,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 2dcef0070..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
@@ -60,9 +60,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 6be7f3c7d..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
@@ -59,9 +59,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public EnumInteractionResult a(EntityHuman entityhuman, Vec3D vec3d, EnumHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -70,9 +69,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 1e198690c..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
@@ -54,9 +54,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 d4a9ab6a8..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
@@ -75,9 +75,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 a6b1fe11d..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
@@ -54,9 +54,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 0a6a3334c..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
@@ -70,9 +70,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
@@ -117,9 +116,8 @@ public class FishingHookController extends MobEntityController {
         @Override
         public double h(Entity entity) {
             // distance check in k()
-            if (entity == getShooter()) {
+            if (entity == getShooter())
                 return 0D;
-            }
             return super.h(entity);
         }
 
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 02f01193c..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
@@ -66,9 +66,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 f8bb6dc76..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
@@ -66,9 +66,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 2a3a8debb..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
@@ -54,9 +54,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 0424a7def..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
@@ -54,9 +54,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 8377bf5b4..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
@@ -73,9 +73,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 473fd3c77..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
@@ -54,9 +54,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 c79fe84a2..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
@@ -54,9 +54,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 1be6a3b81..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
@@ -54,9 +54,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 63d13bb6d..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
@@ -49,9 +49,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 46b12fcb9..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
@@ -54,9 +54,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 999845d1e..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
@@ -49,9 +49,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 7f3fb85b3..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
@@ -49,9 +49,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 924be9059..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
@@ -54,9 +54,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 0e5f766ef..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
@@ -54,9 +54,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 935a3ca40..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
@@ -54,9 +54,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 d9b85c56b..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
@@ -54,9 +54,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 21fd6f2c2..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
@@ -54,9 +54,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 b6a45c228..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
@@ -54,9 +54,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 78954ea21..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
@@ -54,9 +54,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 b31d08e35..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
@@ -55,9 +55,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 60c9a8d18..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
@@ -54,9 +54,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 b6f3ae3bf..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
@@ -54,9 +54,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 00bb69137..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
@@ -54,9 +54,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean a(Tag<FluidType> tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(tag, d0);
-            }
             Vec3D old = getMot().add(0, 0, 0);
             boolean res = super.a(tag, d0);
             if (!npc.isPushableByFluids()) {
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 94b7f74f6..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
@@ -38,13 +38,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(IBlockData block) {
         float base = block.h(null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(IBlockData block) {
-        if (block.isRequiresSpecialTool()) {
+        if (block.isRequiresSpecialTool())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.canDestroySpecialBlock(block) : false;
         }
@@ -67,7 +67,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffects.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffects.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffects.SLOWER_DIG)) {
                 float f1 = 1.0F;
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java
index 68e3969b5..2b56915a1 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java
@@ -33,9 +33,8 @@ public class CustomEntityRegistry extends RegistryBlocks implements Supplier<Reg
 
     @Override
     public int a(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.a((EntityTypes) key);
     }
 
@@ -83,25 +82,22 @@ public class CustomEntityRegistry extends RegistryBlocks implements Supplier<Reg
 
     @Override
     public EntityTypes get(MinecraftKey key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
     @Override
     public MinecraftKey getKey(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey((EntityTypes) value);
     }
 
     @Override
     public Optional getOptional(MinecraftKey var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return this.wrapped.getOptional(var0);
     }
 
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 2b194c2ff..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
@@ -59,7 +59,7 @@ public class EntityMoveControl extends ControllerMove {
                     this.h /= 3;
                 }
                 ai.getJumpControl().jump();
-            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && (d0 * d0 + d1 * d1) < 1.0D) {
+            } else if (d2 >= NMS.getStepHeight(a.getBukkitEntity()) && d0 * d0 + d1 * d1 < 1.0D) {
                 ai.getJumpControl().jump();
             }
         }
@@ -84,9 +84,9 @@ public class EntityMoveControl extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (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 45b6b5df2..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
@@ -74,7 +74,7 @@ public class EntityNavigation extends NavigationAbstract {
 
     @Override
     protected boolean a() {
-        return (this.a.isOnGround() || p() || this.a.isPassenger());
+        return this.a.isOnGround() || p() || this.a.isPassenger();
     }
 
     @Override
@@ -87,18 +87,21 @@ public class EntityNavigation extends NavigationAbstract {
     public PathEntity a(BlockPosition var0, int var1) {
         if (this.b.getType(var0).isAir()) {
             BlockPosition var2 = var0.down();
-            while (var2.getY() > 0 && this.b.getType(var2).isAir())
+            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())
+            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())
+            while (var2.getY() < this.b.getBuildHeight() && this.b.getType(var2).getMaterial().isBuildable()) {
                 var2 = var2.up();
+            }
             return supera(var2, var1);
         }
         return supera(var0, var1);
@@ -121,7 +124,7 @@ public class EntityNavigation extends NavigationAbstract {
     @Override
     public boolean a(Entity var0, double var1) {
         PathEntity var3 = a(var0, 1);
-        return (var3 != null && a(var3, var1));
+        return var3 != null && a(var3, var1);
     }
 
     @Override
@@ -172,8 +175,9 @@ public class EntityNavigation extends NavigationAbstract {
             this.c = null;
             return false;
         }
-        if (!var0.a(this.c))
+        if (!var0.a(this.c)) {
             this.c = var0;
+        }
         if (m())
             return false;
         D_();
@@ -187,7 +191,7 @@ public class EntityNavigation extends NavigationAbstract {
     }
 
     protected boolean a(PathType var0) {
-        if ((var0 == PathType.WATER) || (var0 == PathType.LAVA) || (var0 == PathType.OPEN))
+        if (var0 == PathType.WATER || var0 == PathType.LAVA || var0 == PathType.OPEN)
             return false;
         return true;
     }
@@ -199,7 +203,7 @@ public class EntityNavigation extends NavigationAbstract {
 
     @Override
     protected PathEntity a(Set<BlockPosition> var0, int var1, boolean var2, int var3) {
-        if (var0.isEmpty() || (this.a.locY() < 0.0D) || !a())
+        if (var0.isEmpty() || this.a.locY() < 0.0D || !a())
             return null;
         if (this.c != null && !this.c.c() && var0.contains(this.p))
             return this.c;
@@ -242,7 +246,7 @@ public class EntityNavigation extends NavigationAbstract {
             } else {
                 this.h = var1;
                 double var2 = var0.f(Vec3D.c(this.h));
-                this.k = (this.a.dN() > 0.0F) ? (var2 / this.a.dN() * 1000.0D) : 0.0D;
+                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();
@@ -274,14 +278,16 @@ public class EntityNavigation extends NavigationAbstract {
         double var17 = 1.0D / Math.abs(var9);
         double var19 = var5 - var0.x;
         double var21 = var6 - var0.z;
-        if (var7 >= 0.0D)
+        if (var7 >= 0.0D) {
             var19++;
-        if (var9 >= 0.0D)
+        }
+        if (var9 >= 0.0D) {
             var21++;
+        }
         var19 /= var7;
         var21 /= var9;
-        int var23 = (var7 < 0.0D) ? -1 : 1;
-        int var24 = (var9 < 0.0D) ? -1 : 1;
+        int var23 = var7 < 0.0D ? -1 : 1;
+        int var24 = var9 < 0.0D ? -1 : 1;
         int var25 = MathHelper.floor(var1.x);
         int var26 = MathHelper.floor(var1.z);
         int var27 = var25 - var5;
@@ -314,8 +320,9 @@ public class EntityNavigation extends NavigationAbstract {
         PathPoint var1 = this.c.d();
         Vec3D var2 = new Vec3D((var1.a + this.a.locX()) / 2.0D, (var1.b + this.a.locY()) / 2.0D,
                 (var1.c + this.a.locZ()) / 2.0D);
-        if (var0.a(var2, (this.c.e() - this.c.f())))
+        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,
@@ -324,8 +331,9 @@ public class EntityNavigation extends NavigationAbstract {
                 new BlockPosition(var0 + var3 - 1, var1 + var4 - 1, var2 + var5 - 1))) {
             double var13 = var12.getX() + 0.5D - var6.x;
             double var15 = var12.getZ() + 0.5D - var6.z;
-            if (var13 * var7 + var15 * var9 < 0.0D)
+            if (var13 * var7 + var15 * var9 < 0.0D) {
                 continue;
+            }
             if (!this.b.getType(var12).a(this.b, var12, PathMode.LAND))
                 return false;
         }
@@ -333,8 +341,8 @@ public class EntityNavigation extends NavigationAbstract {
     }
 
     public boolean b(PathType pathtype) {
-        return (pathtype != PathType.DANGER_FIRE && pathtype != PathType.DANGER_CACTUS
-                && pathtype != PathType.DANGER_OTHER);
+        return pathtype != PathType.DANGER_FIRE && pathtype != PathType.DANGER_CACTUS
+                && pathtype != PathType.DANGER_OTHER;
     }
 
     private boolean b(Vec3D var0) {
@@ -346,14 +354,15 @@ public class EntityNavigation extends NavigationAbstract {
         Vec3D var2 = Vec3D.c(this.c.d(this.c.f() + 1));
         Vec3D var3 = var2.d(var1);
         Vec3D var4 = var0.d(var1);
-        return (var3.b(var4) > 0.0D);
+        return var3.b(var4) > 0.0D;
     }
 
     @Override
     public void c() {
         this.e++;
-        if (this.m)
+        if (this.m) {
             j();
+        }
         if (m())
             return;
         if (a()) {
@@ -362,8 +371,9 @@ public class EntityNavigation extends NavigationAbstract {
             Vec3D vec3D1 = b();
             Vec3D vec3D2 = this.c.a(this.a);
             if (vec3D1.y > vec3D2.y && !this.a.isOnGround() && MathHelper.floor(vec3D1.x) == MathHelper.floor(vec3D2.x)
-                    && MathHelper.floor(vec3D1.z) == MathHelper.floor(vec3D2.z))
+                    && MathHelper.floor(vec3D1.z) == MathHelper.floor(vec3D2.z)) {
                 this.c.a();
+            }
         }
         if (m())
             return;
@@ -446,23 +456,24 @@ public class EntityNavigation extends NavigationAbstract {
     @Override
     protected void l() {
         Vec3D var0 = b();
-        this.l = (this.a.getWidth() > 0.75F) ? (this.a.getWidth() / 2.0F) : (0.75F - this.a.getWidth() / 2.0F);
+        this.l = this.a.getWidth() > 0.75F ? this.a.getWidth() / 2.0F : 0.75F - this.a.getWidth() / 2.0F;
         BaseBlockPosition var1 = this.c.g();
         double var2 = Math.abs(this.a.locX() - (var1.getX() + 0.5D));
         double var4 = Math.abs(this.a.locY() - var1.getY());
         double var6 = Math.abs(this.a.locZ() - (var1.getZ() + 0.5D));
-        boolean var8 = (var2 < this.l && var6 < this.l && var4 < 1.0D);
+        boolean var8 = var2 < this.l && var6 < this.l && var4 < 1.0D;
         boolean b2 = Math.abs(this.a.locX() - (var1.getX() + 0.5D)) < this.l
                 && Math.abs(this.a.locZ() - (var1.getZ() + 0.5D)) < this.l
                 && Math.abs(this.a.locY() - var1.getY()) < 1.0D; // old-style calc
-        if (var8 || b2 || (b((this.c.h()).l) && b(var0)))
+        if (var8 || b2 || b(this.c.h().l) && b(var0)) {
             this.c.a();
+        }
         a(var0);
     }
 
     @Override
     public boolean m() {
-        return (this.c == null || this.c.c());
+        return this.c == null || this.c.c();
     }
 
     @Override
@@ -477,7 +488,7 @@ public class EntityNavigation extends NavigationAbstract {
 
     @Override
     protected boolean p() {
-        return (this.a.aH() || this.a.aQ());
+        return this.a.aH() || this.a.aQ();
     }
 
     @Override
@@ -503,12 +514,13 @@ public class EntityNavigation extends NavigationAbstract {
             return;
         for (int var0 = 0; var0 < this.c.e(); var0++) {
             PathPoint var1 = this.c.a(var0);
-            PathPoint var2 = (var0 + 1 < this.c.e()) ? this.c.a(var0 + 1) : null;
+            PathPoint var2 = var0 + 1 < this.c.e() ? this.c.a(var0 + 1) : null;
             IBlockData var3 = this.b.getType(new BlockPosition(var1.a, var1.b, var1.c));
             if (var3.a(Blocks.CAULDRON)) {
                 this.c.a(var0, var1.a(var1.a, var1.b + 1, var1.c));
-                if (var2 != null && var1.b >= var2.b)
+                if (var2 != null && var1.b >= var2.b) {
                     this.c.a(var0 + 1, var1.a(var2.a, var1.b + 1, var2.c));
+                }
             }
         }
     }
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 6f62dc354..3996b39b6 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
@@ -42,9 +42,7 @@ public class EntityPathfinder extends Pathfinder {
         this.d.a();
         this.c.a(var0, var1);
         PathPoint var6 = this.c.b();
-        Map var7 = var2.stream().collect(Collectors.toMap((var0x) -> {
-            return this.c.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ());
-        }, Function.identity()));
+        Map var7 = var2.stream().collect(Collectors.toMap(var0x -> this.c.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ()), Function.identity()));
         PathEntity var8 = this.a(var6, var7, var3, var4, var5);
         this.c.a();
         return var8;
@@ -54,9 +52,7 @@ public class EntityPathfinder extends Pathfinder {
         this.d.a();
         this.c.a(var0, var1);
         PathPoint var6 = this.c.b();
-        Map var7 = var2.stream().collect(Collectors.toMap((var0x) -> {
-            return this.c.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ());
-        }, Function.identity()));
+        Map var7 = var2.stream().collect(Collectors.toMap(var0x -> this.c.a((double) var0x.getX(), (double) var0x.getY(), (double) var0x.getZ()), Function.identity()));
         PathEntity var8 = this.a(var6, var7, var3, var4, var5);
         this.c.a();
         return var8;
@@ -93,10 +89,12 @@ public class EntityPathfinder extends Pathfinder {
                     var8.add(pathDestination);
                 }
             }
-            if (!var8.isEmpty())
+            if (!var8.isEmpty()) {
                 break;
-            if (pathPoint.a(var0) >= var2)
+            }
+            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];
@@ -116,12 +114,10 @@ public class EntityPathfinder extends Pathfinder {
                 }
             }
         }
-        Optional var10 = !var8.isEmpty() ? var8.stream().map((var1x) -> {
-            return this.a(var1x.d(), (BlockPosition) var1.get(var1x), true);
-        }).min(Comparator.comparingInt(PathEntity::e)) : getFallbackDestinations(var1, var5).findFirst();
-        if (!var10.isPresent()) {
+        Optional var10 = !var8.isEmpty() ? var8.stream().map(var1x -> this.a(var1x.d(), (BlockPosition) var1.get(var1x), true)).min(Comparator.comparingInt(PathEntity::e)) : getFallbackDestinations(var1, var5).findFirst();
+        if (!var10.isPresent())
             return null;
-        } else {
+        else {
             PathEntity var11 = (PathEntity) var10.get();
             return var11;
         }
@@ -139,11 +135,8 @@ public class EntityPathfinder extends Pathfinder {
 
     public Stream<PathEntity> getFallbackDestinations(Map<PathDestination, BlockPosition> var1,
             Set<PathDestination> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.a(var1x.d(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(PathEntity::n).thenComparingInt(PathEntity::e));
+        return var5.stream().map(var1x -> this.a(var1x.d(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(PathEntity::n).thenComparingInt(PathEntity::e));
     }
 }
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 4a64a9c86..c1047a4e5 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
@@ -74,21 +74,23 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
     }
 
     private PathType a(EntityLiving var0, int var1, int var2, int var3) {
-        return this.k.computeIfAbsent(BlockPosition.a(var1, var2, var3), (var4) -> {
-            return this.a(this.a, var1, var2, var3, var0, this.d, this.e, this.f, this.d(), this.c());
-        });
+        return this.k.computeIfAbsent(BlockPosition.a(var1, var2, var3), var4 -> this.a(this.a, var1, var2, var3, var0, this.d, this.e, this.f, this.d(), this.c()));
     }
 
     protected PathType a(IBlockAccess var0, boolean var1, boolean var2, BlockPosition var3, PathType var4) {
-        if (var4 == PathType.DOOR_WOOD_CLOSED && var1 && var2)
+        if (var4 == PathType.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = PathType.WALKABLE;
-        if (var4 == PathType.DOOR_OPEN && !var2)
+        }
+        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))
+                && !(var0.getType(var3.down()).getBlock() instanceof BlockMinecartTrackAbstract)) {
             var4 = PathType.UNPASSABLE_RAIL;
-        if (var4 == PathType.LEAVES)
+        }
+        if (var4 == PathType.LEAVES) {
             var4 = PathType.BLOCKED;
+        }
         return var4;
     }
 
@@ -112,8 +114,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         for (PathType var15 : var10) {
             if (mvmt.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13))
+            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == PathType.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return PathType.OPEN;
@@ -134,8 +137,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         for (PathType var15 : var10) {
             if (mvmt.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13))
+            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == PathType.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return PathType.OPEN;
@@ -152,8 +156,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
                     int var17 = var14 + var3;
                     PathType var18 = a(var0, var15, var16, var17);
                     var18 = a(var0, var7, var8, var11, var18);
-                    if (var12 == 0 && var13 == 0 && var14 == 0)
+                    if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
+                    }
                     var9.add(var18);
                 }
             }
@@ -175,21 +180,23 @@ 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))
+        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
                 && var12 != PathType.TRAPDOOR) {
             var8 = a(var0, var1 + 1, var2, var3 - 1, var4, var6, var7);
             if (var8 != null && (var8.l == PathType.OPEN || var8.l == PathType.WALKABLE) && this.b.getWidth() < 1.0F) {
-                double var16 = (var0 - var6.getAdjacentX()) + 0.5D;
-                double var18 = (var2 - var6.getAdjacentZ()) + 0.5D;
+                double var16 = var0 - var6.getAdjacentX() + 0.5D;
+                double var18 = var2 - var6.getAdjacentZ() + 0.5D;
                 AxisAlignedBB var20 = new AxisAlignedBB(var16 - var14,
-                        aa(this.a, var9.c(var16, (var1 + 1), var18)) + 0.001D, var18 - var14, var16 + var14,
+                        aa(this.a, var9.c(var16, var1 + 1, var18)) + 0.001D, var18 - var14, var16 + var14,
                         this.b.getHeight() + aa(this.a, var9.c(var8.a, var8.b, var8.c)) - 0.002D, var18 + var14);
-                if (a(var20))
+                if (a(var20)) {
                     var8 = null;
+                }
             }
         }
         if (var12 == PathType.WATER && !e()) {
@@ -253,7 +260,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         Vec3D var1 = new Vec3D(var0.a - this.b.locX(), var0.b - this.b.locY(), var0.c - this.b.locZ());
         AxisAlignedBB var2 = this.b.getBoundingBox();
         int var3 = MathHelper.f(var1.f() / var2.a());
-        var1 = var1.a((1.0F / var3));
+        var1 = var1.a(1.0F / var3);
         for (int var4 = 1; var4 <= var3; var4++) {
             var2 = var2.c(var1);
             if (a(var2))
@@ -263,7 +270,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
     }
 
     private boolean a(PathPoint var0, PathPoint var1) {
-        return (var0 != null && !var0.i && (var0.k >= 0.0F || var1.k < 0.0F));
+        return var0 != null && !var0.i && (var0.k >= 0.0F || var1.k < 0.0F);
     }
 
     private boolean a(PathPoint var0, PathPoint var1, PathPoint var2, PathPoint var3) {
@@ -273,9 +280,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             return false;
         if (var1.l == PathType.WALKABLE_DOOR || var2.l == PathType.WALKABLE_DOOR || var3.l == PathType.WALKABLE_DOOR)
             return false;
-        boolean var4 = (var2.l == PathType.FENCE && var1.l == PathType.FENCE && this.b.getWidth() < 0.5D);
-        return (var3.k >= 0.0F && (var2.b < var0.b || var2.k >= 0.0F || var4)
-                && (var1.b < var0.b || var1.k >= 0.0F || var4));
+        boolean var4 = var2.l == PathType.FENCE && var1.l == PathType.FENCE && this.b.getWidth() < 0.5D;
+        return var3.k >= 0.0F && (var2.b < var0.b || var2.k >= 0.0F || var4)
+                && (var1.b < var0.b || var1.k >= 0.0F || var4);
     }
 
     @Override
@@ -284,33 +291,42 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         int var3 = 0;
         PathType var4 = a(this.b, var1.a, var1.b + 1, var1.c);
         PathType var5 = a(this.b, var1.a, var1.b, var1.c);
-        if (mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != PathType.STICKY_HONEY)
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        if (a(var1, var10, var8, var15)) {
             var0[var2++] = var15;
+        }
         return var2;
     }
 
@@ -337,8 +353,9 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
             BlockPosition blockPosition = this.b.getChunkCoordinates();
             while ((this.a.getType(blockPosition).isAir()
                     || this.a.getType(blockPosition).a(this.a, blockPosition, PathMode.LAND))
-                    && blockPosition.getY() > 0)
+                    && blockPosition.getY() > 0) {
                 blockPosition = blockPosition.down();
+            }
             var0 = blockPosition.up().getY();
         }
         BlockPosition var3 = this.b.getChunkCoordinates();
@@ -363,7 +380,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
 
     private boolean b(BlockPosition var0) {
         PathType var1 = a(this.b, var0);
-        return (mvmt.getPathfindingMalus(var1) >= 0.0F);
+        return mvmt.getPathfindingMalus(var1) >= 0.0F;
     }
 
     public static PathType a(IBlockAccess var0, BlockPosition.MutableBlockPosition var1) {
@@ -373,19 +390,25 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         PathType var5 = b(var0, var1);
         if (var5 == PathType.OPEN && var3 >= 1) {
             PathType var6 = b(var0, var1.d(var2, var3 - 1, var4));
-            var5 = (var6 == PathType.WALKABLE || var6 == PathType.OPEN || var6 == PathType.WATER
-                    || var6 == PathType.LAVA) ? PathType.OPEN : PathType.WALKABLE;
-            if (var6 == PathType.DAMAGE_FIRE)
+            var5 = var6 == PathType.WALKABLE || var6 == PathType.OPEN || var6 == PathType.WATER || var6 == PathType.LAVA
+                    ? PathType.OPEN
+                    : PathType.WALKABLE;
+            if (var6 == PathType.DAMAGE_FIRE) {
                 var5 = PathType.DAMAGE_FIRE;
-            if (var6 == PathType.DAMAGE_CACTUS)
+            }
+            if (var6 == PathType.DAMAGE_CACTUS) {
                 var5 = PathType.DAMAGE_CACTUS;
-            if (var6 == PathType.DAMAGE_OTHER)
+            }
+            if (var6 == PathType.DAMAGE_OTHER) {
                 var5 = PathType.DAMAGE_OTHER;
-            if (var6 == PathType.STICKY_HONEY)
+            }
+            if (var6 == PathType.STICKY_HONEY) {
                 var5 = PathType.STICKY_HONEY;
+            }
         }
-        if (var5 == PathType.WALKABLE)
+        if (var5 == PathType.WALKABLE) {
             var5 = a(var0, var1.d(var2, var3, var4), var5);
+        }
         return var5;
     }
 
@@ -415,7 +438,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
     }
 
     private static boolean a(IBlockData var0) {
-        return (var0.a(TagsBlock.FIRE) || var0.a(Blocks.LAVA) || var0.a(Blocks.MAGMA_BLOCK) || BlockCampfire.g(var0));
+        return var0.a(TagsBlock.FIRE) || var0.a(Blocks.LAVA) || var0.a(Blocks.MAGMA_BLOCK) || BlockCampfire.g(var0);
     }
 
     public static double aa(IBlockAccess var0, BlockPosition var1) {
@@ -458,7 +481,7 @@ public class EntityPathfinderNormal extends EntityPathfinderAbstract {
         if (var3 instanceof BlockLeaves)
             return PathType.LEAVES;
         if (var3.a(TagsBlock.FENCES) || var3.a(TagsBlock.WALLS)
-                || (var3 instanceof BlockFenceGate && !var2.get(BlockFenceGate.OPEN).booleanValue()))
+                || var3 instanceof BlockFenceGate && !var2.get(BlockFenceGate.OPEN).booleanValue())
             return PathType.FENCE;
         if (!var2.a(var0, var1, PathMode.LAND))
             return PathType.BLOCKED;
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 03903a91f..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
@@ -169,9 +169,8 @@ public interface MobAI {
                     mob.getControllerJump().b();
                 }
             };
-        } else if (handle instanceof 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 2c701268d..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
@@ -507,9 +507,8 @@ public class NMSImpl implements NMSBridge {
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer()
                 .getMinecraftSessionService();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -543,17 +542,15 @@ public class NMSImpl implements NMSBridge {
                 bserver = ((EntityWither) NMSImpl.getHandle(entity)).bossBattle;
             } else if (entity.getType() == EntityType.ENDER_DRAGON) {
                 Object battleObject = ENDERDRAGON_BATTLE_FIELD.invoke(NMSImpl.getHandle(entity));
-                if (battleObject == null) {
+                if (battleObject == null)
                     return null;
-                }
                 bserver = ((EnderDragonBattle) battleObject).bossBattle;
             }
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -580,9 +577,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof MobAI ? ((MobAI) handle).getMoveControl() : null;
-        if (controller == null || !controller.b()) {
+        if (controller == null || !controller.b())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -593,9 +589,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).getHeadRotation();
     }
 
@@ -656,7 +651,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -668,9 +663,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_PROFILE_FIELD == null) {
             SKULL_PROFILE_FIELD = NMS.getField(meta.getClass(), "profile", false);
-            if (SKULL_PROFILE_FIELD == null) {
+            if (SKULL_PROFILE_FIELD == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
@@ -710,8 +704,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -730,23 +724,14 @@ public class NMSImpl implements NMSBridge {
         PathPoint last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final PathEntity path = new PathEntity(list, last != null ? new BlockPosition(last.a, last.b, last.c) : null,
                 true);
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -852,11 +837,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -1041,7 +1025,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof MobAI))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof MobAI)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1052,8 +1036,9 @@ public class NMSImpl implements NMSBridge {
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY))
                     - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            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 {
@@ -1084,7 +1069,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof MobAI))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof MobAI)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1133,14 +1118,12 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     this.bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(),
                             new CitizensInventoryAnvil(this.containerAccess.getLocation(), this.repairInventory,
                                     this.resultInventory, this, anvil),
                             this);
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.getBukkitView().setItem(0, anvil.getItem(0));
@@ -1183,8 +1166,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             EntityTypes<?> type = ENTITY_REGISTRY.findType(search);
             MinecraftKey key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.a(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1476,9 +1460,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SET_PROFILE_METHOD == null) {
             SET_PROFILE_METHOD = NMS.getMethodHandle(meta.getClass(), "setProfile", true, GameProfile.class);
-            if (SET_PROFILE_METHOD == null) {
+            if (SET_PROFILE_METHOD == null)
                 return;
-            }
         }
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
@@ -1766,9 +1749,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1856,9 +1838,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_16_R3.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1867,25 +1848,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_16_R3.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_16_R3.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_16_R3.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_16_R3.NBTTagInt) base).asInt());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_16_R3.NBTTagFloat) base).asFloat());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_16_R3.NBTTagDouble) base).asDouble());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_16_R3.NBTTagLong) base).asLong());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_16_R3.NBTTagShort) base).asShort());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_16_R3.NBTTagByte) base).asByte());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_16_R3.NBTTagByteArray) base).getBytes());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_16_R3.NBTTagIntArray) base).getInts());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagString)
             return new StringTag(key, base.asString());
-        } else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_16_R3.NBTTagList) {
             List<net.minecraft.server.v1_16_R3.NBTBase> list = (List<net.minecraft.server.v1_16_R3.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1895,19 +1876,17 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(EntityLiving entity, Vec3D vec3d) {
         if (entity.doAITick() || entity.cs()) {
             double d0 = 0.08D;
-            boolean flag = ((entity.getMot()).y <= 0.0D);
+            boolean flag = entity.getMot().y <= 0.0D;
             if (flag && entity.hasEffect(MobEffects.SLOW_FALLING)) {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
@@ -1918,26 +1897,31 @@ public class NMSImpl implements NMSBridge {
                 float f = entity.isSprinting() ? 0.9F : 0.8F;
                 float f1 = 0.02F;
                 float f2 = EnchantmentManager.e(entity);
-                if (f2 > 3.0F)
+                if (f2 > 3.0F) {
                     f2 = 3.0F;
-                if (!entity.isOnGround())
+                }
+                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))
+                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())
+                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))
+                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);
@@ -1949,15 +1933,18 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setMot(entity.getMot().a(0.5D));
                 }
-                if (!entity.isNoGravity())
+                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))
+                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)
+                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);
@@ -1974,9 +1961,10 @@ public class NMSImpl implements NMSBridge {
                     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)
+                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) {
@@ -1993,13 +1981,14 @@ public class NMSImpl implements NMSBridge {
                     }
                 }
                 if (entity.isOnGround() && !entity.world.isClientSide && entity.getFlag(7)
-                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())
+                        && !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();
+                        entity.getBoundingBox().minY - 0.5000001D, entity.locZ());// entity.ar();
                 float f5 = entity.world.getType(blockposition).getBlock().getFrictionFactor();
-                float f = entity.isOnGround() ? (f5 * 0.91F) : 0.91F;
+                float f = entity.isOnGround() ? f5 * 0.91F : 0.91F;
                 Vec3D vec3d6 = entity.a(vec3d, f5);
                 double d7 = vec3d6.y;
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -2114,9 +2103,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, EntityInsentient handle, Vec3D vec3d, float speed) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
             handle.a(speed > 0 ? speed : handle instanceof EntityTurtle ? 0.1F : 0.01F, vec3d);
             handle.move(EnumMoveType.SELF, handle.getMot());
@@ -2167,7 +2155,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2176,8 +2164,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
@@ -2205,14 +2193,10 @@ public class NMSImpl implements NMSBridge {
                 AttributeProvider provider = (AttributeProvider) ATTRIBUTE_MAP.invoke(entity.getAttributeMap());
                 Map<AttributeBase, AttributeModifiable> all = Maps
                         .newHashMap((Map<AttributeBase, AttributeModifiable>) ATTRIBUTE_PROVIDER_MAP.invoke(provider));
-                all.put(GenericAttributes.FOLLOW_RANGE,
-                        new AttributeModifiable(GenericAttributes.FOLLOW_RANGE, new Consumer<AttributeModifiable>() {
-                            @Override
-                            public void accept(AttributeModifiable att) {
-                                throw new UnsupportedOperationException(
-                                        "Tried to change value for default attribute instance FOLLOW_RANGE");
-                            }
-                        }));
+                all.put(GenericAttributes.FOLLOW_RANGE, new AttributeModifiable(GenericAttributes.FOLLOW_RANGE, att -> {
+                    throw new UnsupportedOperationException(
+                            "Tried to change value for default attribute instance FOLLOW_RANGE");
+                }));
                 ATTRIBUTE_PROVIDER_MAP_SETTER.invoke(provider, ImmutableMap.copyOf(all));
             } catch (Throwable e) {
                 e.printStackTrace();
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 4c90088a4..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
@@ -81,9 +81,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -135,9 +134,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 d845d3914..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
@@ -80,17 +80,15 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +162,7 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,9 +173,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected Brain makeBrain(Dynamic dynamic) {
-            if (npc == null || npc.useMinecraftAI()) {
+            if (npc == null || npc.useMinecraftAI())
                 return super.makeBrain(dynamic);
-            }
             return brainProvider().makeBrain(dynamic);
         }
 
@@ -186,19 +183,17 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET) {
+            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET)
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -214,8 +209,9 @@ public class AxolotlController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -251,9 +247,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 d046dbc23..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
@@ -62,9 +62,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -144,7 +143,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -178,9 +177,8 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 e9a5ee05b..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
@@ -59,9 +59,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -141,7 +140,7 @@ public class BeeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,9 +174,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 399bb41de..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
@@ -59,9 +59,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -136,7 +135,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,9 +169,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 52d3b1a7d..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
@@ -62,17 +62,15 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class CatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 e85e79ca3..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
@@ -61,17 +61,15 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -215,9 +212,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 7e881b4e5..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
@@ -70,17 +70,15 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -163,7 +161,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -174,11 +172,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 37a8ccb49..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
@@ -86,17 +86,15 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -190,7 +188,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -204,19 +202,17 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,8 +228,9 @@ public class CodController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 52648a812..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
@@ -67,17 +67,15 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -160,7 +158,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -174,19 +172,17 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +228,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 17b137671..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
@@ -65,17 +65,15 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -165,7 +163,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,11 +174,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,8 +193,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -236,9 +234,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 ebdefb4b3..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
@@ -74,17 +74,15 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -163,7 +161,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -174,11 +172,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -194,8 +191,9 @@ public class DolphinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -235,9 +233,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5b01638ba..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
@@ -61,17 +61,15 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -185,8 +182,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -205,9 +203,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a4306e616..0cf42d3dc 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
@@ -149,9 +149,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -218,7 +217,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -240,8 +239,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -264,9 +264,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 4d84eedc9..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
@@ -64,17 +64,15 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -161,7 +159,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -172,11 +170,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -192,8 +189,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class EndermanController extends MobEntityController {
         @Override
         public Optional<Boolean> safeTeleport(double d0, double d1, double d2, boolean flag,
                 PlayerTeleportEvent.TeleportCause cause) {
-            if (npc == null) {
+            if (npc == null)
                 return super.safeTeleport(d0, d1, d2, flag, cause);
-            }
             return Optional.of(false);
         }
 
@@ -230,9 +227,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a964d246f..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
@@ -61,17 +61,15 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -185,8 +182,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -214,9 +212,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 162aba42b..06164bb96 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
@@ -82,17 +82,15 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean broadcastToPlayer(ServerPlayer entityplayer) {
-        if (npc != null && playerlistTracker == null) {
+        if (npc != null && playerlistTracker == null)
             return false;
-        }
         return super.broadcastToPlayer(entityplayer);
     }
 
     @Override
     public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.causeFallDamage(f, f1, damagesource);
-        }
         return false;
     }
 
@@ -107,16 +105,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                EntityHumanNPC.this.getLevel().removePlayerImmediately(EntityHumanNPC.this, RemovalReason.KILLED);
-                ((ServerLevel) level).getChunkProvider().removeEntity(EntityHumanNPC.this);
-            }
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) () -> {
+            EntityHumanNPC.this.getLevel().removePlayerImmediately(EntityHumanNPC.this, RemovalReason.KILLED);
+            ((ServerLevel) level).getChunkProvider().removeEntity(EntityHumanNPC.this);
         }, 15); // give enough time for death and smoke animation
     }
 
@@ -229,9 +223,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public Component getTabListDisplayName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new TextComponent("");
-        }
         return super.getTabListDisplayName();
     }
 
@@ -243,12 +236,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         boolean damaged = super.hurt(damagesource, f);
         if (damaged && hurtMarked) {
             hurtMarked = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.hurtMarked = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.hurtMarked = true);
         }
         return damaged;
     }
@@ -272,9 +260,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean isInWall() {
-        if (npc == null || noPhysics || isSleeping()) {
+        if (npc == null || noPhysics || isSleeping())
             return super.isInWall();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -313,11 +300,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean onClimbable() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.onClimbable();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
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 1b59f1825..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
@@ -55,17 +55,15 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +197,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 94afef230..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
@@ -56,17 +56,15 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 890ee8127..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
@@ -53,9 +53,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -136,7 +135,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,9 +169,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a4816c310..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
@@ -55,17 +55,15 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 bb03c47b9..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
@@ -55,17 +55,15 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class GlowSquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 c6c1baa55..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
@@ -56,17 +56,15 @@ public class GoatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class GoatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 0b957d1e6..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
@@ -70,17 +70,15 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -215,9 +212,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 48ee8a30f..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
@@ -70,17 +70,15 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -215,9 +212,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 b924afdd3..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
@@ -55,17 +55,15 @@ public class HoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -182,8 +179,9 @@ public class HoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,9 +200,8 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 b9e7402a7..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
@@ -80,17 +80,15 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -177,9 +175,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +193,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +204,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 2a9c56e81..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
@@ -58,6 +58,7 @@ public class HorseDonkeyController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseDonkeyNPC(EntityType<? extends Donkey> types, Level level) {
             this(types, level, null);
         }
@@ -79,17 +80,15 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -176,9 +175,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -195,7 +193,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -206,11 +204,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -256,9 +253,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 2e6adc1fa..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
@@ -80,17 +80,15 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -177,9 +175,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +193,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +204,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a2d79cbde..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
@@ -80,17 +80,15 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -177,9 +175,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +193,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +204,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 7e677de75..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
@@ -80,17 +80,15 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -177,9 +175,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +193,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +204,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -257,9 +253,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 d9b7168be..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
@@ -23,7 +23,6 @@ import net.minecraft.server.level.ServerLevel;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -45,16 +44,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get("removefromplayerlist",
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 a0f7746d4..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
@@ -55,17 +55,15 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,9 +197,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 52c094074..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
@@ -55,17 +55,15 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5edaa4ae4..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
@@ -58,6 +58,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityType<? extends Llama> types, Level level) {
             this(types, level, null);
         }
@@ -74,17 +75,15 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -171,9 +170,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -190,7 +188,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -201,11 +199,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -251,9 +248,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 224953dba..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
@@ -65,17 +65,15 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -187,8 +184,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -231,9 +229,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 01a9614c8..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
@@ -77,5 +77,5 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
 }
\ No newline at end of file
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 980bed118..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
@@ -59,17 +59,15 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,11 +168,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -199,8 +196,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -219,9 +217,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 59433ac27..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
@@ -57,17 +57,15 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 255a89ebd..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
@@ -56,17 +56,15 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 478d55f0c..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
@@ -56,9 +56,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -138,7 +137,7 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -150,9 +149,8 @@ public class ParrotController extends MobEntityController {
         @Override
         public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
-            }
             return InteractionResult.FAIL;
         }
 
@@ -181,9 +179,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 0991016d5..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
@@ -90,17 +90,15 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -181,7 +179,7 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -192,11 +190,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -221,8 +218,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -246,9 +244,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 b620d20bf..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
@@ -64,17 +64,15 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,9 +222,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 6d018ea81..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
@@ -55,17 +55,15 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -201,9 +199,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 03f5c2737..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
@@ -55,17 +55,15 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -182,8 +179,9 @@ public class PiglinBruteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,9 +200,8 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 0d399258a..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
@@ -55,17 +55,15 @@ public class PiglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -182,8 +179,9 @@ public class PiglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -202,9 +200,8 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a87cc77e4..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
@@ -56,17 +56,15 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 4a2fd62f3..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
@@ -54,9 +54,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -132,7 +131,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,9 +174,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 844841e22..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
@@ -86,17 +86,15 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,9 +147,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public EntityDimensions getDimensions(Pose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.getDimensions(entitypose);
-            }
             return super.getDimensions(entitypose).scale(1 / s(getPuffState())).scale(0.5F);
         }
 
@@ -193,7 +190,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,19 +204,17 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -270,9 +265,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 fb5374ed4..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
@@ -57,17 +57,15 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -158,7 +156,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,11 +167,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -230,9 +227,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5f6a38e94..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
@@ -56,17 +56,15 @@ public class RavagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 ad7ed3902..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
@@ -80,17 +80,15 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -182,7 +180,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -196,19 +194,17 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,8 +220,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -246,9 +243,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5e32520e3..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
@@ -56,17 +56,15 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,8 +186,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -209,9 +207,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 cbb5f0c8d..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
@@ -63,17 +63,15 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -225,9 +223,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5e3e86119..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
@@ -55,17 +55,15 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a47e75a5e..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
@@ -55,17 +55,15 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 020f35919..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
@@ -55,17 +55,15 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 814d37ff8..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
@@ -55,17 +55,15 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5362be676..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
@@ -65,17 +65,15 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 23fdf6b69..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
@@ -55,17 +55,15 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5128980dc..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
@@ -55,17 +55,15 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 7787df1b6..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
@@ -55,17 +55,15 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 b708470f7..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
@@ -55,17 +55,15 @@ public class StriderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class StriderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class StriderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 7a5649d18..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
@@ -68,17 +68,15 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -167,7 +165,7 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -178,11 +176,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -228,9 +225,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 099ffdfc1..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
@@ -80,17 +80,15 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -184,7 +182,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,19 +196,17 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -226,8 +222,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -248,9 +245,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 08a4e556e..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
@@ -69,17 +69,15 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -170,7 +168,7 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -181,11 +179,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 573dbead1..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
@@ -56,9 +56,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -134,7 +133,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,9 +167,8 @@ public class VexController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5bfa62b01..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
@@ -68,17 +68,15 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -172,7 +170,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -195,11 +193,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -252,9 +249,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 8aff8332c..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
@@ -56,17 +56,15 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -210,9 +207,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 77357c561..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
@@ -66,17 +66,15 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -175,7 +173,7 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,11 +196,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -259,9 +256,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 77d10a5fb..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
@@ -55,17 +55,15 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 2a5f220ef..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
@@ -53,9 +53,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -146,7 +145,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,8 +167,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -179,9 +179,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 bdeb5a3b8..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
@@ -58,17 +58,15 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -217,9 +214,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 6ce010334..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
@@ -55,17 +55,15 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class ZoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -201,9 +199,8 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 eee144650..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
@@ -55,17 +55,15 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 35e21188f..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
@@ -55,17 +55,15 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 dc5372eca..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
@@ -55,17 +55,15 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -148,7 +146,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -159,11 +157,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -179,8 +176,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -199,9 +197,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 96e6e9328..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
@@ -116,9 +116,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 ec1b62cd9..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
@@ -87,7 +87,7 @@ public class BoatController extends MobEntityController {
         private Status getStatus() {
             Status entityboat_Status = u();
             if (entityboat_Status != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
             if (t())
@@ -163,7 +163,7 @@ public class BoatController extends MobEntityController {
                         if (fluid.is(FluidTags.WATER)) {
                             float f = l1 + fluid.getHeight(this.level, blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -182,7 +182,7 @@ public class BoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == Status.IN_AIR && this.aE != Status.IN_AIR && this.aE != Status.ON_LAND) {
                     this.aC = getY(1.0D);
-                    setPos(getX(), (getWaterLevelAbove() - getBbHeight()) + 0.101D, getZ());
+                    setPos(getX(), getWaterLevelAbove() - getBbHeight() + 0.101D, getZ());
                     setDeltaMovement(getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                     this.aE = Status.IN_WATER;
                 } else {
@@ -208,7 +208,7 @@ public class BoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3 vec3d1 = getDeltaMovement();
-                        setDeltaMovement(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(MoverType.SELF, getDeltaMovement());
@@ -236,8 +236,8 @@ public class BoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.set(k1, l1, i2);
                         FluidState fluid = this.level.getFluidState(blockposition_mutableblockposition);
-                        if (fluid.is(FluidTags.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.level, blockposition_mutableblockposition))) {
+                        if (fluid.is(FluidTags.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.level, blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
@@ -250,9 +250,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 e69f97db6..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
@@ -128,9 +128,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 505351b58..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
@@ -134,9 +134,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 3ec38ef18..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
@@ -116,9 +116,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 1f095574d..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
@@ -120,9 +120,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 76f3a96ec..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
@@ -117,9 +117,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 0befcb85e..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
@@ -71,9 +71,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -124,9 +123,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 e8c19c9b7..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
@@ -110,9 +110,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 e05503c06..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
@@ -146,9 +146,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 18892dab4..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
@@ -111,9 +111,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 08c568f4b..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
@@ -61,9 +61,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public double distanceToSqr(Entity entity) {
-            if (entity == getPlayerOwner()) {
+            if (entity == getPlayerOwner())
                 return 0D;
-            }
             return super.distanceToSqr(entity);
         }
 
@@ -135,9 +134,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 3005fb27a..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
@@ -127,9 +127,8 @@ public class GlowItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 937ce5ab3..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
@@ -130,9 +130,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 6a74a9952..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
@@ -126,9 +126,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 1395b66a3..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
@@ -122,9 +122,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 c20cbadd7..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
@@ -116,9 +116,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 05297bbbd..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
@@ -131,9 +131,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 baafc49f3..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
@@ -110,9 +110,8 @@ public class MarkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 cb9f2607c..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
@@ -111,9 +111,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a9b763fe7..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
@@ -111,9 +111,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 199cbf812..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
@@ -111,9 +111,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5c91385e0..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
@@ -98,9 +98,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 b4b135539..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
@@ -110,9 +110,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 9ab1da415..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
@@ -98,9 +98,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 bbb967763..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
@@ -98,9 +98,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 4a1685279..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
@@ -115,9 +115,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5874ecb5b..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
@@ -110,9 +110,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 031901755..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
@@ -113,9 +113,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 a0cd1e88c..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
@@ -110,9 +110,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 72ec45a76..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
@@ -111,9 +111,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 b2858d196..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
@@ -111,9 +111,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 86ff9c5b6..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
@@ -114,9 +114,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 cfcdb2183..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
@@ -115,9 +115,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 7012309d3..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
@@ -111,9 +111,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 04155297a..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
@@ -110,9 +110,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 bb975af43..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
@@ -110,9 +110,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> Tag, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(Tag, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(Tag, d0);
             if (!npc.isPushableByFluids()) {
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 5a474b9f5..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     protected float getStrength(BlockState block) {
         float base = block.getDestroySpeed(null, BlockPos.ZERO);
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(BlockState block) {
-        if (block.requiresCorrectToolForDrops()) {
+        if (block.requiresCorrectToolForDrops())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CustomEntityRegistry.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CustomEntityRegistry.java
index 9f6edafdf..51700c265 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CustomEntityRegistry.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CustomEntityRegistry.java
@@ -191,25 +191,22 @@ public class CustomEntityRegistry extends DefaultedRegistry implements Supplier<
 
     @Override
     public EntityType get(ResourceLocation key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
     @Override
     public int getId(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.getId((EntityType) key);
     }
 
     @Override
     public ResourceLocation getKey(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey((EntityType) value);
     }
 
@@ -220,9 +217,8 @@ public class CustomEntityRegistry extends DefaultedRegistry implements Supplier<
 
     @Override
     public Optional getOptional(ResourceLocation var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return this.wrapped.getOptional(var0);
     }
 
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 a7247260d..56b361da2 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
@@ -69,9 +69,9 @@ public class EntityMoveControl extends MoveControl {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
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 62185e3d2..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
@@ -67,8 +67,8 @@ public class EntityNavigation extends PathNavigation {
     }
 
     public boolean canCutCorner(BlockPathTypes pathtype) {
-        return (pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_CACTUS
-                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR);
+        return pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_CACTUS
+                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR;
     }
 
     @Override
@@ -98,14 +98,16 @@ public class EntityNavigation extends PathNavigation {
         double var17 = 1.0D / Math.abs(var9);
         double var19 = var5 - var0.x;
         double var21 = var6 - var0.z;
-        if (var7 >= 0.0D)
+        if (var7 >= 0.0D) {
             var19++;
-        if (var9 >= 0.0D)
+        }
+        if (var9 >= 0.0D) {
             var21++;
+        }
         var19 /= var7;
         var21 /= var9;
-        int var23 = (var7 < 0.0D) ? -1 : 1;
-        int var24 = (var9 < 0.0D) ? -1 : 1;
+        int var23 = var7 < 0.0D ? -1 : 1;
+        int var24 = var9 < 0.0D ? -1 : 1;
         int var25 = Mth.floor(var1.x);
         int var26 = Mth.floor(var1.z);
         int var27 = var25 - var5;
@@ -136,17 +138,18 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected boolean canUpdatePath() {
-        return (this.mob.isOnGround() || isInLiquid() || this.mob.isPassenger());
+        return this.mob.isOnGround() || isInLiquid() || this.mob.isPassenger();
     }
 
     private boolean canWalkAbove(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7,
             double var9) {
         for (BlockPos var12 : BlockPos.betweenClosed(new BlockPos(var0, var1, var2),
                 new BlockPos(var0 + var3 - 1, var1 + var4 - 1, var2 + var5 - 1))) {
-            double var13 = (var12.getX() + 0.5D) - var6.x;
-            double var15 = (var12.getZ() + 0.5D) - var6.z;
-            if (var13 * var7 + var15 * var9 < 0.0D)
+            double var13 = var12.getX() + 0.5D - var6.x;
+            double var15 = var12.getZ() + 0.5D - var6.z;
+            if (var13 * var7 + var15 * var9 < 0.0D) {
                 continue;
+            }
             if (!this.level.getBlockState(var12).isPathfindable(this.level, var12, PathComputationType.LAND))
                 return false;
         }
@@ -161,8 +164,8 @@ public class EntityNavigation extends PathNavigation {
             return false;
         for (int var13 = var11; var13 < var11 + var3; var13++) {
             for (int var14 = var12; var14 < var12 + var5; var14++) {
-                double var15 = (var13 + 0.5D) - var6.x;
-                double var17 = (var14 + 0.5D) - var6.z;
+                double var15 = var13 + 0.5D - var6.x;
+                double var17 = var14 + 0.5D - var6.z;
                 if (var15 * var7 + var17 * var9 >= 0.0D) {
                     BlockPathTypes var19 = this.nodeEvaluator.getBlockPathType(this.level, var13, var1 - 1, var14,
                             this.mob, var3, var4, var5, true, true);
@@ -186,19 +189,22 @@ public class EntityNavigation extends PathNavigation {
     public Path createPath(BlockPos var0, int var1) {
         if (this.level.getBlockState(var0).isAir()) {
             BlockPos var2 = var0.down();
-            while (var2.getY() > this.level.getMinBuildHeight() && this.level.getBlockState(var2).isAir())
+            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())
+            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())
+                    && this.level.getBlockState(var2).getMaterial().isSolid()) {
                 var2 = var2.up();
+            }
             return supercreatePath(var2, var1);
         }
         return supercreatePath(var0, var1);
@@ -226,7 +232,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected Path createPath(Set<BlockPos> var0, int var1, boolean var2, int var3, float var4) {
-        if (var0.isEmpty() || (this.mob.getY() < this.level.getMinBuildHeight()) || !canUpdatePath())
+        if (var0.isEmpty() || this.mob.getY() < this.level.getMinBuildHeight() || !canUpdatePath())
             return null;
         if (this.path != null && !this.path.isDone() && var0.contains(this.targetPos))
             return this.path;
@@ -274,10 +280,11 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.timeoutCachedNode = blockPos;
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
-                this.timeoutLimit = (this.mob.getSpeed() > 0.0F) ? (var2 / this.mob.getSpeed() * 1000.0D) : 0.0D;
+                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)
+            if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
+            }
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
     }
@@ -285,15 +292,16 @@ public class EntityNavigation extends PathNavigation {
     @Override
     protected void followThePath() {
         Vec3 var0 = getTempMobPos();
-        this.maxDistanceToWaypoint = (this.mob.getBbWidth() > 0.75F) ? (this.mob.getBbWidth() / 2.0F)
-                : (0.75F - this.mob.getBbWidth() / 2.0F);
+        this.maxDistanceToWaypoint = this.mob.getBbWidth() > 0.75F ? this.mob.getBbWidth() / 2.0F
+                : 0.75F - this.mob.getBbWidth() / 2.0F;
         BlockPos blockPos = this.path.getNextNodePos();
         double var2 = Math.abs(this.mob.getX() - (blockPos.getX() + 0.5D));
         double var4 = Math.abs(this.mob.getY() - blockPos.getY());
         double var6 = Math.abs(this.mob.getZ() - (blockPos.getZ() + 0.5D));
-        boolean var8 = (var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D);
-        if (var8 || (canCutCorner((this.path.getNextNode()).type) && shouldTargetNextNodeInDirection(var0)))
+        boolean var8 = var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D;
+        if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
+        }
         doStuckDetection(var0);
     }
 
@@ -347,19 +355,19 @@ public class EntityNavigation extends PathNavigation {
     }
 
     protected boolean hasValidPathType(BlockPathTypes var0) {
-        if ((var0 == BlockPathTypes.WATER) || (var0 == BlockPathTypes.LAVA) || (var0 == BlockPathTypes.OPEN))
+        if (var0 == BlockPathTypes.WATER || var0 == BlockPathTypes.LAVA || var0 == BlockPathTypes.OPEN)
             return false;
         return true;
     }
 
     @Override
     public boolean isDone() {
-        return (this.path == null || this.path.isDone());
+        return this.path == null || this.path.isDone();
     }
 
     @Override
     protected boolean isInLiquid() {
-        return (this.mob.isInWaterOrBubble() || this.mob.isInLava());
+        return this.mob.isInWaterOrBubble() || this.mob.isInLava();
     }
 
     @Override
@@ -386,7 +394,7 @@ public class EntityNavigation extends PathNavigation {
     @Override
     public boolean moveTo(Entity var0, double var1) {
         Path var3 = createPath(var0, 1);
-        return (var3 != null && moveTo(var3, var1));
+        return var3 != null && moveTo(var3, var1);
     }
 
     @Override
@@ -395,8 +403,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-        if (!var0.sameAs(this.path))
+        if (!var0.sameAs(this.path)) {
             this.path = var0;
+        }
         if (isDone())
             return false;
         trimPath();
@@ -430,8 +439,9 @@ public class EntityNavigation extends PathNavigation {
         Node var1 = this.path.getEndNode();
         Vec3 var2 = new Vec3((var1.x + this.mob.getX()) / 2.0D, (var1.y + this.mob.getY()) / 2.0D,
                 (var1.z + this.mob.getZ()) / 2.0D);
-        if (var0.closerThan(var2, (this.path.getNodeCount() - this.path.getNextNodeIndex())))
+        if (var0.closerThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex())) {
             recomputePath();
+        }
     }
 
     @Override
@@ -486,7 +496,7 @@ public class EntityNavigation extends PathNavigation {
         Vec3 var2 = Vec3.atBottomCenterOf(this.path.getNodePos(this.path.getNextNodeIndex() + 1));
         Vec3 var3 = var2.subtract(var1);
         Vec3 var4 = var0.subtract(var1);
-        return (var3.dot(var4) > 0.0D);
+        return var3.dot(var4) > 0.0D;
     }
 
     @Override
@@ -503,12 +513,13 @@ public class EntityNavigation extends PathNavigation {
             return;
         for (int var0 = 0; var0 < this.path.getNodeCount(); var0++) {
             Node var1 = this.path.getNode(var0);
-            Node var2 = (var0 + 1 < this.path.getNodeCount()) ? this.path.getNode(var0 + 1) : null;
+            Node var2 = var0 + 1 < this.path.getNodeCount() ? this.path.getNode(var0 + 1) : null;
             BlockState var3 = this.level.getBlockState(new BlockPos(var1.x, var1.y, var1.z));
             if (var3.is(BlockTags.CAULDRONS)) {
                 this.path.replaceNode(var0, var1.cloneAndMove(var1.x, var1.y + 1, var1.z));
-                if (var2 != null && var1.y >= var2.y)
+                if (var2 != null && var1.y >= var2.y) {
                     this.path.replaceNode(var0 + 1, var1.cloneAndMove(var2.x, var1.y + 1, var2.z));
+                }
             }
         }
     }
@@ -527,8 +538,9 @@ public class EntityNavigation extends PathNavigation {
             Vec3 vec31 = getTempMobPos();
             Vec3 vec32 = this.path.getNextEntityPos(this.mob);
             if (vec31.y > vec32.y && !this.mob.isOnGround() && Mth.floor(vec31.x) == Mth.floor(vec32.x)
-                    && Mth.floor(vec31.z) == Mth.floor(vec32.z))
+                    && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
+            }
         }
         if (isDone())
             return;
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 a0167e0db..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
@@ -35,15 +35,15 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
-    private final Long2ObjectMap<BlockPathTypes> l = new Long2ObjectOpenHashMap<BlockPathTypes>();
-    private final Object2BooleanMap<AABB> m = new Object2BooleanOpenHashMap<AABB>();
+    private final Long2ObjectMap<BlockPathTypes> l = new Long2ObjectOpenHashMap<>();
+    private final Object2BooleanMap<AABB> m = new Object2BooleanOpenHashMap<>();
     protected float oldWaterCost;
 
     private boolean canReachWithoutCollision(Node var0) {
         Vec3 var1 = new Vec3(var0.x - this.mob.getX(), var0.y - this.mob.getY(), var0.z - this.mob.getZ());
         AABB var2 = this.mob.getBoundingBox();
         int var3 = Mth.ceil(var1.length() / var2.getSize());
-        var1 = var1.scale((1.0F / var3));
+        var1 = var1.scale(1.0F / var3);
         for (int var4 = 1; var4 <= var3; var4++) {
             var2 = var2.move(var1);
             if (hasCollisions(var2))
@@ -62,17 +62,21 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
     protected BlockPathTypes evaluateBlockPathType(BlockGetter var0, boolean var1, boolean var2, BlockPos var3,
             BlockPathTypes var4) {
-        if (var4 == BlockPathTypes.DOOR_WOOD_CLOSED && var1 && var2)
+        if (var4 == BlockPathTypes.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = BlockPathTypes.WALKABLE_DOOR;
-        if (var4 == BlockPathTypes.DOOR_OPEN && !var2)
+        }
+        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))
+                        .getBlock() instanceof net.minecraft.world.level.block.BaseRailBlock)) {
             var4 = BlockPathTypes.UNPASSABLE_RAIL;
-        if (var4 == BlockPathTypes.LEAVES)
+        }
+        if (var4 == BlockPathTypes.LEAVES) {
             var4 = BlockPathTypes.BLOCKED;
+        }
         return var4;
     }
 
@@ -91,9 +95,10 @@ 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))
+        if (var7 == BlockPathTypes.FENCE && var8 != null && var8.costMalus >= 0.0F && !canReachWithoutCollision(var8)) {
             var8 = null;
-        if (var12 == BlockPathTypes.WALKABLE || (isAmphibious() && var12 == BlockPathTypes.WATER))
+        }
+        if (var12 == BlockPathTypes.WALKABLE || isAmphibious() && var12 == BlockPathTypes.WATER)
             return var8;
         if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0 && var12 != BlockPathTypes.FENCE
                 && var12 != BlockPathTypes.UNPASSABLE_RAIL && var12 != BlockPathTypes.TRAPDOOR
@@ -101,15 +106,16 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             var8 = findAcceptedNode(var0, var1 + 1, var2, var3 - 1, var4, var6, var7);
             if (var8 != null && (var8.type == BlockPathTypes.OPEN || var8.type == BlockPathTypes.WALKABLE)
                     && this.mob.getBbWidth() < 1.0F) {
-                double var16 = (var0 - var6.getStepX()) + 0.5D;
-                double var18 = (var2 - var6.getStepZ()) + 0.5D;
+                double var16 = var0 - var6.getStepX() + 0.5D;
+                double var18 = var2 - var6.getStepZ() + 0.5D;
                 AABB var20 = new AABB(var16 - var14,
-                        getFloorLevel(this.level, var9.set(var16, (var1 + 1), var18)) + 0.001D, var18 - var14,
+                        getFloorLevel(this.level, var9.set(var16, var1 + 1, var18)) + 0.001D, var18 - var14,
                         var16 + var14,
                         this.mob.getBbHeight() + getFloorLevel(this.level, var9.set(var8.x, var8.y, var8.z)) - 0.002D,
                         var18 + var14);
-                if (hasCollisions(var20))
+                if (hasCollisions(var20)) {
                     var8 = null;
+                }
             }
         }
         if (!isAmphibious() && var12 == BlockPathTypes.WATER && !canFloat()) {
@@ -188,8 +194,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         for (BlockPathTypes var15 : var10) {
             if (mvmt.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13))
+            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
@@ -211,8 +218,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         for (BlockPathTypes var15 : var10) {
             if (var4.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (var4.getPathfindingMalus(var15) >= var4.getPathfindingMalus(var13))
+            if (var4.getPathfindingMalus(var15) >= var4.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
@@ -237,8 +245,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         for (BlockPathTypes var15 : var10) {
             if (mvmt.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13))
+            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
@@ -255,8 +264,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     int var17 = var14 + var3;
                     BlockPathTypes var18 = getBlockPathType(var0, var15, var16, var17);
                     var18 = evaluateBlockPathType(var0, var7, var8, var11, var18);
-                    if (var12 == 0 && var13 == 0 && var14 == 0)
+                    if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
+                    }
                     var9.add(var18);
                 }
             }
@@ -291,33 +301,42 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         int var3 = 0;
         BlockPathTypes var4 = getCachedBlockType(this.mob, var1.x, var1.y + 1, var1.z);
         BlockPathTypes var5 = getCachedBlockType(this.mob, var1.x, var1.y, var1.z);
-        if (this.mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != BlockPathTypes.STICKY_HONEY)
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        if (isDiagonalValid(var1, var10, var8, var15)) {
             var0[var2++] = var15;
+        }
         return var2;
     }
 
@@ -344,8 +363,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             BlockPos blockPos = this.mob.blockPosition();
             while ((this.level.getBlockState(blockPos).isAir() || this.level.getBlockState(blockPos)
                     .isPathfindable(this.level, blockPos, PathComputationType.LAND))
-                    && blockPos.getY() > this.mob.level.getMinBuildHeight())
+                    && blockPos.getY() > this.mob.level.getMinBuildHeight()) {
                 blockPos = blockPos.down();
+            }
             var0 = blockPos.up().getY();
         }
         BlockPos var3 = this.mob.blockPosition();
@@ -374,7 +394,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
     private boolean hasPositiveMalus(BlockPos var0) {
         BlockPathTypes var1 = getBlockPathType(this.mob, var0);
-        return (this.mvmt.getPathfindingMalus(var1) >= 0.0F);
+        return this.mvmt.getPathfindingMalus(var1) >= 0.0F;
     }
 
     protected boolean isAmphibious() {
@@ -389,14 +409,14 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (var1.type == BlockPathTypes.WALKABLE_DOOR || var2.type == BlockPathTypes.WALKABLE_DOOR
                 || var3.type == BlockPathTypes.WALKABLE_DOOR)
             return false;
-        boolean var4 = (var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
-                && this.mob.getBbWidth() < 0.5D);
-        return (var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
-                && (var1.y < var0.y || var1.costMalus >= 0.0F || var4));
+        boolean var4 = var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
+                && this.mob.getBbWidth() < 0.5D;
+        return var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
+                && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
     }
 
     protected boolean isNeighborValid(Node var0, Node var1) {
-        return (var0 != null && !var0.closed && (var0.costMalus >= 0.0F || var1.costMalus < 0.0F));
+        return var0 != null && !var0.closed && (var0.costMalus >= 0.0F || var1.costMalus < 0.0F);
     }
 
     @Override
@@ -465,8 +485,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             return BlockPathTypes.RAIL;
         if (var3 instanceof net.minecraft.world.level.block.LeavesBlock)
             return BlockPathTypes.LEAVES;
-        if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS) || (var3 instanceof FenceGateBlock
-                && !((Boolean) var2.getValue((Property<?>) FenceGateBlock.OPEN)).booleanValue()))
+        if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS) || var3 instanceof FenceGateBlock
+                && !((Boolean) var2.getValue((Property<?>) FenceGateBlock.OPEN)).booleanValue())
             return BlockPathTypes.FENCE;
         if (!var2.isPathfindable(var0, var1, PathComputationType.LAND))
             return BlockPathTypes.BLOCKED;
@@ -482,19 +502,24 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         BlockPathTypes var5 = getBlockPathTypeRaw(var0, var1);
         if (var5 == BlockPathTypes.OPEN && var3 >= var0.getMinBuildHeight() + 1) {
             BlockPathTypes var6 = getBlockPathTypeRaw(var0, var1.set(var2, var3 - 1, var4));
-            var5 = (var6 == BlockPathTypes.WALKABLE || var6 == BlockPathTypes.OPEN || var6 == BlockPathTypes.WATER
-                    || var6 == BlockPathTypes.LAVA) ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE;
-            if (var6 == BlockPathTypes.DAMAGE_FIRE)
+            var5 = var6 == BlockPathTypes.WALKABLE || var6 == BlockPathTypes.OPEN || var6 == BlockPathTypes.WATER
+                    || var6 == BlockPathTypes.LAVA ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE;
+            if (var6 == BlockPathTypes.DAMAGE_FIRE) {
                 var5 = BlockPathTypes.DAMAGE_FIRE;
-            if (var6 == BlockPathTypes.DAMAGE_CACTUS)
+            }
+            if (var6 == BlockPathTypes.DAMAGE_CACTUS) {
                 var5 = BlockPathTypes.DAMAGE_CACTUS;
-            if (var6 == BlockPathTypes.DAMAGE_OTHER)
+            }
+            if (var6 == BlockPathTypes.DAMAGE_OTHER) {
                 var5 = BlockPathTypes.DAMAGE_OTHER;
-            if (var6 == BlockPathTypes.STICKY_HONEY)
+            }
+            if (var6 == BlockPathTypes.STICKY_HONEY) {
                 var5 = BlockPathTypes.STICKY_HONEY;
+            }
         }
-        if (var5 == BlockPathTypes.WALKABLE)
+        if (var5 == BlockPathTypes.WALKABLE) {
             var5 = checkNeighbourBlocks(var0, var1.set(var2, var3, var4), var5);
+        }
         return var5;
     }
 
@@ -505,7 +530,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     public static boolean isBurningBlock(BlockState var0) {
-        return (var0.is(BlockTags.FIRE) || var0.is(Blocks.LAVA) || var0.is(Blocks.MAGMA_BLOCK)
-                || CampfireBlock.isLitCampfire(var0) || var0.is(Blocks.LAVA_CAULDRON));
+        return var0.is(BlockTags.FIRE) || var0.is(Blocks.LAVA) || var0.is(Blocks.MAGMA_BLOCK)
+                || CampfireBlock.isLitCampfire(var0) || var0.is(Blocks.LAVA_CAULDRON);
     }
 }
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 823bf6a0d..72727fda7 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
@@ -93,10 +93,12 @@ public class EntityPathfinder extends PathFinder {
                     var9.add(target);
                 }
             }
-            if (!var9.isEmpty())
+            if (!var9.isEmpty()) {
                 break;
-            if (node.distanceTo(var1) >= var3)
+            }
+            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];
@@ -138,12 +140,9 @@ public class EntityPathfinder extends PathFinder {
     }
 
     public Stream<Path> getFallbackDestinations(Map<Target, BlockPos> var1, Set<Target> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
+        return var5.stream().map(var1x -> this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
     }
 
     private Path reconstructPath(Node var0, BlockPos var1, boolean var2) {
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 2489824a1..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
@@ -168,9 +168,8 @@ public interface MobAI {
                     mob.getJumpControl().tick();
                 }
             };
-        } else if (handle instanceof 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 51a2b829d..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
@@ -516,9 +516,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().getSessionService();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -559,9 +558,8 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -588,9 +586,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         MoveControl controller = handle instanceof Mob ? ((Mob) handle).getMoveControl()
                 : handle instanceof MobAI ? ((MobAI) handle).getMoveControl() : null;
-        if (controller == null || !controller.hasWanted()) {
+        if (controller == null || !controller.hasWanted())
             return null;
-        }
         return new Location(entity.getWorld(), controller.getWantedX(), controller.getWantedY(),
                 controller.getWantedZ());
     }
@@ -602,9 +599,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof org.bukkit.entity.LivingEntity)) {
+        if (!(entity instanceof org.bukkit.entity.LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((org.bukkit.entity.LivingEntity) entity).getYHeadRot();
     }
 
@@ -665,7 +661,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -677,9 +673,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_PROFILE_FIELD == null) {
             SKULL_PROFILE_FIELD = NMS.getField(meta.getClass(), "profile", false);
-            if (SKULL_PROFILE_FIELD == null) {
+            if (SKULL_PROFILE_FIELD == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_PROFILE_FIELD.get(meta);
@@ -711,8 +706,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof org.bukkit.entity.LivingEntity))
             return DEFAULT_SPEED;
         LivingEntity handle = NMSImpl.getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float) handle.getAttribute(Attributes.d).getValue();
     }
@@ -725,22 +720,18 @@ public class NMSImpl implements NMSBridge {
     @Override
     public MCNavigator getTargetNavigator(org.bukkit.entity.Entity entity, Iterable<Vector> dest,
             final NavigatorParameters params) {
-        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(dest, (input) -> {
-            return new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ());
-        }));
+        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(dest,
+                input -> new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ())));
         Node last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final Path path = new Path(list, last != null ? new BlockPos(last.x, last.y, last.z) : null, true);
-        return getTargetNavigator(entity, params, (input) -> {
-            return input.moveTo(path, params.speed());
-        });
+        return getTargetNavigator(entity, params, input -> input.moveTo(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, (input) -> {
-            return input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -847,11 +838,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -1043,7 +1033,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1054,8 +1044,9 @@ public class NMSImpl implements NMSBridge {
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY))
                     - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            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 {
@@ -1086,7 +1077,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             if (to instanceof org.bukkit.entity.LivingEntity) {
                 look(from, ((org.bukkit.entity.LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1133,14 +1124,12 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     this.bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(),
                             new CitizensInventoryAnvil(this.access.getLocation(), this.inputSlots, this.resultSlots,
                                     this, anvil),
                             this);
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.getBukkitView().setItem(0, anvil.getItem(0));
@@ -1183,8 +1172,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             net.minecraft.world.entity.EntityType<?> type = ENTITY_REGISTRY.findType(search);
             ResourceLocation key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1468,9 +1458,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SET_PROFILE_METHOD == null) {
             SET_PROFILE_METHOD = NMS.getMethodHandle(meta.getClass(), "setProfile", true, GameProfile.class);
-            if (SET_PROFILE_METHOD == null) {
+            if (SET_PROFILE_METHOD == null)
                 return;
-            }
         }
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
@@ -1754,9 +1743,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.moveTo(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1845,9 +1833,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1856,25 +1843,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.nbt.Tag base) {
-        if (base instanceof net.minecraft.nbt.IntTag) {
+        if (base instanceof net.minecraft.nbt.IntTag)
             return new IntTag(key, ((net.minecraft.nbt.IntTag) base).getAsInt());
-        } else if (base instanceof net.minecraft.nbt.FloatTag) {
+        else if (base instanceof net.minecraft.nbt.FloatTag)
             return new FloatTag(key, ((net.minecraft.nbt.FloatTag) base).getAsFloat());
-        } else if (base instanceof net.minecraft.nbt.DoubleTag) {
+        else if (base instanceof net.minecraft.nbt.DoubleTag)
             return new DoubleTag(key, ((net.minecraft.nbt.DoubleTag) base).getAsDouble());
-        } else if (base instanceof net.minecraft.nbt.LongTag) {
+        else if (base instanceof net.minecraft.nbt.LongTag)
             return new LongTag(key, ((net.minecraft.nbt.LongTag) base).getAsLong());
-        } else if (base instanceof net.minecraft.nbt.ShortTag) {
+        else if (base instanceof net.minecraft.nbt.ShortTag)
             return new ShortTag(key, ((net.minecraft.nbt.ShortTag) base).getAsShort());
-        } else if (base instanceof net.minecraft.nbt.ByteTag) {
+        else if (base instanceof net.minecraft.nbt.ByteTag)
             return new ByteTag(key, ((net.minecraft.nbt.ByteTag) base).getAsByte());
-        } else if (base instanceof net.minecraft.nbt.ByteArrayTag) {
+        else if (base instanceof net.minecraft.nbt.ByteArrayTag)
             return new ByteArrayTag(key, ((net.minecraft.nbt.ByteArrayTag) base).getAsByteArray());
-        } else if (base instanceof net.minecraft.nbt.IntArrayTag) {
+        else if (base instanceof net.minecraft.nbt.IntArrayTag)
             return new IntArrayTag(key, ((net.minecraft.nbt.IntArrayTag) base).getAsIntArray());
-        } else if (base instanceof net.minecraft.nbt.StringTag) {
+        else if (base instanceof net.minecraft.nbt.StringTag)
             return new StringTag(key, base.getAsString());
-        } else if (base instanceof net.minecraft.nbt.ListTag) {
+        else if (base instanceof net.minecraft.nbt.ListTag) {
             List<net.minecraft.nbt.Tag> list = (List<net.minecraft.nbt.Tag>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1884,19 +1871,17 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } else if (base instanceof net.minecraft.nbt.CompoundTag) {
-            return convertNBT(((net.minecraft.nbt.CompoundTag) base));
-        } else if (base instanceof net.minecraft.nbt.EndTag) {
+        } else if (base instanceof net.minecraft.nbt.CompoundTag)
+            return convertNBT((net.minecraft.nbt.CompoundTag) base);
+        else if (base instanceof net.minecraft.nbt.EndTag)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) {
         if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) {
             double d0 = 0.08D;
-            boolean flag = ((entity.getDeltaMovement()).y <= 0.0D);
+            boolean flag = entity.getDeltaMovement().y <= 0.0D;
             if (flag && entity.hasEffect(MobEffects.SLOW_FALLING)) {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
@@ -1907,27 +1892,32 @@ public class NMSImpl implements NMSBridge {
                 float f = entity.isSprinting() ? 0.9F : 0.8F;
                 float f1 = 0.02F;
                 float f2 = EnchantmentHelper.getDepthStrider(entity);
-                if (f2 > 3.0F)
+                if (f2 > 3.0F) {
                     f2 = 3.0F;
-                if (!entity.isOnGround())
+                }
+                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))
+                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())
+                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);
                 if (entity.horizontalCollision
-                        && entity.isFree(vec3d2.x, vec3d2.y + 0.6000000238418579D - entity.getY() + d1, vec3d2.z))
+                        && 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);
@@ -1939,16 +1929,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-                if (!entity.isNoGravity())
+                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.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)
+                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);
@@ -1965,9 +1958,10 @@ public class NMSImpl implements NMSBridge {
                     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)
+                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) {
@@ -1984,13 +1978,14 @@ public class NMSImpl implements NMSBridge {
                     }
                 }
                 if (entity.isOnGround() && !entity.level.isClientSide && entity.getSharedFlag(7)
-                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
+                }
             } else {
-                BlockPos blockposition = new BlockPos(entity.getX(), (entity.getBoundingBox()).minY - 0.5000001D,
+                BlockPos blockposition = new BlockPos(entity.getX(), entity.getBoundingBox().minY - 0.5000001D,
                         entity.getZ());
                 float f5 = entity.level.getBlockState(blockposition).getBlock().getFriction();
-                float f = entity.isOnGround() ? (f5 * 0.91F) : 0.91F;
+                float f = entity.isOnGround() ? f5 * 0.91F : 0.91F;
                 Vec3 vec3d6 = entity.handleRelativeFrictionAndCalculateMovement(vec3d, f5);
                 double d7 = vec3d6.y;
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -2105,11 +2100,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, Mob handle, Vec3 vec3d) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
-            handle.moveRelative((handle instanceof Dolphin || handle instanceof Axolotl) ? handle.getSpeed()
+            handle.moveRelative(handle instanceof Dolphin || handle instanceof Axolotl ? handle.getSpeed()
                     : handle instanceof Turtle ? 0.1F : 0.01F, vec3d);
             handle.move(MoverType.SELF, handle.getDeltaMovement());
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
@@ -2159,7 +2153,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2168,8 +2162,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
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 1def74180..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
@@ -83,9 +83,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -144,9 +143,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 98ddc0277..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
@@ -80,17 +80,15 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +162,7 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,9 +173,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected Brain<?> makeBrain(Dynamic<?> dynamic) {
-            if (npc == null || npc.useMinecraftAI()) {
+            if (npc == null || npc.useMinecraftAI())
                 return super.makeBrain(dynamic);
-            }
             return brainProvider().makeBrain(dynamic);
         }
 
@@ -186,19 +183,17 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET) {
+            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET)
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -214,8 +209,9 @@ public class AxolotlController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -258,9 +254,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c0548e999..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
@@ -64,9 +64,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -146,7 +145,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -187,9 +186,8 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ae58050ca..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
@@ -61,9 +61,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -143,7 +142,7 @@ public class BeeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -184,9 +183,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c696c34c3..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
@@ -61,9 +61,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -138,7 +137,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -179,9 +178,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 89fb7ad8b..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
@@ -63,17 +63,15 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class CatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9f96b8ea7..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
@@ -62,17 +62,15 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4f58fce87..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
@@ -71,17 +71,15 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +162,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,11 +173,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2e00f99c8..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
@@ -87,17 +87,15 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -191,7 +189,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -205,19 +203,17 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -263,9 +259,8 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b24b0142a..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
@@ -68,17 +68,15 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -161,7 +159,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,19 +173,17 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -240,9 +236,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1579e2345..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
@@ -65,17 +65,15 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -165,7 +163,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,11 +174,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -196,8 +193,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -243,9 +241,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4124b56b4..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
@@ -74,17 +74,15 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -163,7 +161,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -174,11 +172,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -243,9 +240,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0f808d1c6..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
@@ -62,17 +62,15 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -186,8 +183,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -213,9 +211,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1c0a3fbe8..eee7cb261 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
@@ -151,9 +151,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -220,7 +219,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -242,8 +241,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -273,9 +273,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ab7f73fd8..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
@@ -65,17 +65,15 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -158,7 +156,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,11 +167,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,16 +186,16 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
         public Optional<Boolean> randomTeleport(double d0, double d1, double d2, boolean flag,
                 PlayerTeleportEvent.TeleportCause cause) {
-            if (npc == null) {
+            if (npc == null)
                 return super.randomTeleport(d0, d1, d2, flag, cause);
-            }
             return Optional.of(false);
         }
 
@@ -234,9 +231,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 88e3c252d..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
@@ -62,17 +62,15 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -186,8 +183,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -222,9 +220,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8cd5a5142..2a8a7a1d4 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
@@ -83,17 +83,15 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean broadcastToPlayer(ServerPlayer entityplayer) {
-        if (npc != null && playerlistTracker == null) {
+        if (npc != null && playerlistTracker == null)
             return false;
-        }
         return super.broadcastToPlayer(entityplayer);
     }
 
     @Override
     public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.causeFallDamage(f, f1, damagesource);
-        }
         return false;
     }
 
@@ -108,16 +106,12 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                EntityHumanNPC.this.getLevel().removePlayerImmediately(EntityHumanNPC.this, RemovalReason.KILLED);
-                ((ServerLevel) level).getChunkSource().removeEntity(EntityHumanNPC.this);
-            }
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), (Runnable) () -> {
+            EntityHumanNPC.this.getLevel().removePlayerImmediately(EntityHumanNPC.this, RemovalReason.KILLED);
+            ((ServerLevel) level).getChunkSource().removeEntity(EntityHumanNPC.this);
         }, 15); // give enough time for death and smoke animation
     }
 
@@ -229,9 +223,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public Component getTabListDisplayName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return new TextComponent("");
-        }
         return super.getTabListDisplayName();
     }
 
@@ -243,12 +236,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         boolean damaged = super.hurt(damagesource, f);
         if (damaged && hurtMarked) {
             hurtMarked = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.hurtMarked = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.hurtMarked = true);
         }
         return damaged;
     }
@@ -271,9 +259,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean isInWall() {
-        if (npc == null || noPhysics || isSleeping()) {
+        if (npc == null || noPhysics || isSleeping())
             return super.isInWall();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -310,11 +297,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean onClimbable() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.onClimbable();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -404,9 +390,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
         @Override
         public boolean canSee(org.bukkit.entity.Entity entity) {
-            if (entity != null && entity.getType() == EntityType.ITEM_FRAME) {
+            if (entity != null && entity.getType() == EntityType.ITEM_FRAME)
                 return false; // optimise for large maps in item frames
-            }
             return super.canSee(entity);
         }
 
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 2c38adaea..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
@@ -56,17 +56,15 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -208,9 +205,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5c65d2793..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
@@ -57,17 +57,15 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a2aa11743..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
@@ -55,9 +55,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -138,7 +137,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -179,9 +178,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fea128389..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
@@ -56,17 +56,15 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b1be64e7b..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
@@ -56,17 +56,15 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class GlowSquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d822a2df2..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
@@ -57,17 +57,15 @@ public class GoatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class GoatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 30b8e5841..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
@@ -71,17 +71,15 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ea79decb6..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
@@ -71,17 +71,15 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fe300e932..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
@@ -56,17 +56,15 @@ public class HoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class HoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -210,9 +208,8 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f1c6b054a..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
@@ -81,17 +81,15 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -178,9 +176,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 86aad3ff6..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
@@ -59,6 +59,7 @@ public class HorseDonkeyController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseDonkeyNPC(EntityType<? extends Donkey> types, Level level) {
             this(types, level, null);
         }
@@ -80,17 +81,15 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -177,9 +176,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +194,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +205,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -264,9 +261,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8a0b5f710..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
@@ -81,17 +81,15 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -178,9 +176,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7f4877ab8..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
@@ -81,17 +81,15 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -178,9 +176,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1ae66d100..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
@@ -81,17 +81,15 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -178,9 +176,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 21de104dc..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
@@ -23,7 +23,6 @@ import net.minecraft.server.level.ServerLevel;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -45,16 +44,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST,
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST,
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 cf0986ed0..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
@@ -56,17 +56,15 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -208,9 +205,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fea86e6c9..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
@@ -56,17 +56,15 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b2bfe88af..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
@@ -59,6 +59,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityType<? extends Llama> types, Level level) {
             this(types, level, null);
         }
@@ -75,17 +76,15 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -172,9 +171,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -191,7 +189,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -202,11 +200,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -259,9 +256,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 895055e1a..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
@@ -66,17 +66,15 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -188,8 +185,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -239,9 +237,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c43cff436..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
@@ -77,5 +77,5 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
 }
\ No newline at end of file
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 b62fb2da6..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
@@ -60,17 +60,15 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -171,11 +169,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,8 +197,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -227,9 +225,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 eed9c5be6..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
@@ -58,17 +58,15 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8b7653acf..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
@@ -57,17 +57,15 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 727f525bc..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
@@ -58,9 +58,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -129,9 +128,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public boolean isLeashed() {
-            if (npc == null) {
+            if (npc == null)
                 return super.isLeashed();
-            }
             boolean protectedDefault = npc.isProtected();
             if (!protectedDefault || !npc.data().get(NPC.Metadata.LEASH_PROTECTED, protectedDefault))
                 return super.isLeashed();
@@ -149,7 +147,7 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,9 +159,8 @@ public class ParrotController extends MobEntityController {
         @Override
         public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
-            }
             return InteractionResult.FAIL;
         }
 
@@ -199,9 +196,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0c4670711..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
@@ -91,17 +91,15 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -182,7 +180,7 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -193,11 +191,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -222,8 +219,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -254,9 +252,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f09379e0c..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
@@ -64,17 +64,15 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d00a4ff42..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
@@ -56,17 +56,15 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d9d1311a6..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
@@ -56,17 +56,15 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class PiglinBruteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -210,9 +208,8 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 95341ee04..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
@@ -56,17 +56,15 @@ public class PiglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class PiglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -210,9 +208,8 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a554d0765..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
@@ -57,17 +57,15 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 369fadc69..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
@@ -56,9 +56,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -134,7 +133,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -184,9 +183,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e49d6e139..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
@@ -87,17 +87,15 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,9 +148,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public EntityDimensions getDimensions(Pose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.getDimensions(entitypose);
-            }
             return super.getDimensions(entitypose).scale(1 / s(getPuffState())).scale(0.5F);
         }
 
@@ -194,7 +191,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,19 +205,17 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -278,9 +273,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6bc33bcd0..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
@@ -58,17 +58,15 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -159,7 +157,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,11 +168,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -238,9 +235,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fc2b33e7a..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
@@ -57,22 +57,20 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean canBeControlledByRider() {
-            return (npc == null || npc.useMinecraftAI()) ? super.canBeControlledByRider() : false;
+            return npc == null || npc.useMinecraftAI() ? super.canBeControlledByRider() : false;
         }
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8de51dafa..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
@@ -81,17 +81,15 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -183,7 +181,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -197,19 +195,17 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,8 +221,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2f40adfc2..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
@@ -57,17 +57,15 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -190,8 +187,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 40cabfdd9..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
@@ -64,17 +64,15 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,11 +162,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -184,8 +181,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -233,9 +231,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3b2e66dad..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
@@ -56,17 +56,15 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ffe2b5ef9..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
@@ -56,17 +56,15 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 439641831..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
@@ -56,17 +56,15 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fa5951794..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
@@ -56,17 +56,15 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b42c77b30..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
@@ -66,17 +66,15 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -240,9 +237,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 79cd09b72..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
@@ -56,17 +56,15 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8764794ba..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
@@ -56,17 +56,15 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 73ba7476d..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
@@ -56,17 +56,15 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e7cdd33e1..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
@@ -56,17 +56,15 @@ public class StriderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class StriderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class StriderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b82d93449..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
@@ -69,17 +69,15 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -168,7 +166,7 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -179,11 +177,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -236,9 +233,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2f485d3ea..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
@@ -81,17 +81,15 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -185,7 +183,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -199,19 +197,17 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -227,8 +223,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -256,9 +253,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2a6d66ff8..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
@@ -70,17 +70,15 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -171,7 +169,7 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -182,11 +180,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9bc84e7bb..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
@@ -58,9 +58,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -136,7 +135,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -177,9 +176,8 @@ public class VexController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d7d7a6454..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
@@ -68,17 +68,15 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -172,7 +170,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -195,11 +193,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -259,9 +256,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 478322a82..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
@@ -57,17 +57,15 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 453aba04c..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
@@ -66,17 +66,15 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -175,7 +173,7 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,11 +196,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -266,9 +263,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 38a5eeb93..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
@@ -56,17 +56,15 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9e9cdfe35..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
@@ -55,9 +55,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -148,7 +147,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,8 +169,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -188,9 +188,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 769be943b..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
@@ -59,17 +59,15 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,9 +222,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 bf58adc6b..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
@@ -56,17 +56,15 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -182,8 +179,9 @@ public class ZoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -209,9 +207,8 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 047fae2b1..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
@@ -56,17 +56,15 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 623649777..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
@@ -56,17 +56,15 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 08449c026..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
@@ -56,17 +56,15 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class ZombieVillagerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 09450f478..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
@@ -125,9 +125,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ad171a4fe..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
@@ -88,7 +88,7 @@ public class BoatController extends MobEntityController {
         private Status getStatus() {
             Status entityboat_Status = u();
             if (entityboat_Status != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
             if (t())
@@ -164,7 +164,7 @@ public class BoatController extends MobEntityController {
                         if (fluid.is(FluidTags.WATER)) {
                             float f = l1 + fluid.getHeight(this.level, blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -190,7 +190,7 @@ public class BoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == Status.IN_AIR && this.aE != Status.IN_AIR && this.aE != Status.ON_LAND) {
                     this.aC = getY(1.0D);
-                    setPos(getX(), (getWaterLevelAbove() - getBbHeight()) + 0.101D, getZ());
+                    setPos(getX(), getWaterLevelAbove() - getBbHeight() + 0.101D, getZ());
                     setDeltaMovement(getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                     this.aE = Status.IN_WATER;
                 } else {
@@ -216,7 +216,7 @@ public class BoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3 vec3d1 = getDeltaMovement();
-                        setDeltaMovement(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(MoverType.SELF, getDeltaMovement());
@@ -244,8 +244,8 @@ public class BoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.set(k1, l1, i2);
                         FluidState fluid = this.level.getFluidState(blockposition_mutableblockposition);
-                        if (fluid.is(FluidTags.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.level, blockposition_mutableblockposition))) {
+                        if (fluid.is(FluidTags.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.level, blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
@@ -258,9 +258,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 eb07dcacb..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
@@ -137,9 +137,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1c89b2490..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
@@ -142,9 +142,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 37d1db0c7..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
@@ -125,9 +125,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4b38f748c..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
@@ -129,9 +129,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b22c95fb7..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
@@ -126,9 +126,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 be5e58df9..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
@@ -73,9 +73,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -133,9 +132,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9b3596b50..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
@@ -119,9 +119,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 42e579312..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
@@ -151,9 +151,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 068a5d36b..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
@@ -120,9 +120,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fec28ffcd..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
@@ -62,9 +62,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public double distanceToSqr(Entity entity) {
-            if (entity == getPlayerOwner()) {
+            if (entity == getPlayerOwner())
                 return 0D;
-            }
             return super.distanceToSqr(entity);
         }
 
@@ -143,9 +142,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 38074fae6..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
@@ -135,9 +135,8 @@ public class GlowItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9c1b7faeb..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
@@ -139,9 +139,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b2a6a725e..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
@@ -134,9 +134,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f90ff1647..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
@@ -131,9 +131,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 88db0d1fe..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
@@ -125,9 +125,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 833aeb39f..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
@@ -139,9 +139,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0182cfd21..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
@@ -119,9 +119,8 @@ public class MarkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4b21e5596..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
@@ -120,9 +120,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0b7aed1d6..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
@@ -120,9 +120,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 52ea2809f..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
@@ -120,9 +120,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f6bba3ed0..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
@@ -107,9 +107,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 14c980209..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
@@ -119,9 +119,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 42ef602f5..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
@@ -107,9 +107,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7ce612f45..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
@@ -107,9 +107,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f457d8b39..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
@@ -124,9 +124,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1e0e52bb6..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
@@ -119,9 +119,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7eede6825..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
@@ -122,9 +122,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 bf8c311ae..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
@@ -119,9 +119,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d55540f88..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
@@ -120,9 +120,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7e7125944..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
@@ -120,9 +120,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f52ced29f..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
@@ -123,9 +123,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b133ff86a..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
@@ -124,9 +124,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 465bbd61d..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
@@ -120,9 +120,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 563976189..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
@@ -119,9 +119,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f77bfe126..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
@@ -119,9 +119,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0a9019605..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     protected float getStrength(BlockState block) {
         float base = block.getDestroySpeed(null, BlockPos.ZERO);
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(BlockState block) {
-        if (block.requiresCorrectToolForDrops()) {
+        if (block.requiresCorrectToolForDrops())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CustomEntityRegistry.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CustomEntityRegistry.java
index 60e4ed1f0..970ac8ca5 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CustomEntityRegistry.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CustomEntityRegistry.java
@@ -201,9 +201,8 @@ public class CustomEntityRegistry extends DefaultedRegistry implements Supplier<
 
     @Override
     public EntityType get(ResourceLocation key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
@@ -219,17 +218,15 @@ public class CustomEntityRegistry extends DefaultedRegistry implements Supplier<
 
     @Override
     public int getId(Object key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.getId((EntityType) key);
     }
 
     @Override
     public ResourceLocation getKey(Object value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey((EntityType) value);
     }
 
@@ -240,9 +237,8 @@ public class CustomEntityRegistry extends DefaultedRegistry implements Supplier<
 
     @Override
     public Optional getOptional(ResourceLocation var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return this.wrapped.getOptional(var0);
     }
 
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 356b1f619..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
@@ -68,9 +68,9 @@ public class EntityMoveControl extends MoveControl {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
@@ -94,10 +94,9 @@ public class EntityMoveControl extends MoveControl {
             double dZ = this.tz - this.entity.getZ();
             double dY = this.ty - this.entity.getY();
             double dXZ = Math.sqrt(dX * dX + dZ * dZ);
-            if (Math.abs(dY) < 1.0 && dXZ < 0.01) {
+            if (Math.abs(dY) < 1.0 && dXZ < 0.01)
                 // this.entity.zza = 0.0F;
                 return;
-            }
             if (dXZ > 0.4) {
                 float f = (float) Math.toDegrees(Mth.atan2(dZ, dX)) - 90.0F;
                 this.entity.setYRot(rotlerp(this.entity.getYRot(), f, 90.0F));
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 dbd26dc0c..2fce92943 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
@@ -68,8 +68,8 @@ public class EntityNavigation extends PathNavigation {
     }
 
     public boolean canCutCorner(BlockPathTypes pathtype) {
-        return (pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_CACTUS
-                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR);
+        return pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_CACTUS
+                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR;
     }
 
     @Override
@@ -139,7 +139,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected boolean canUpdatePath() {
-        return (this.mob.isOnGround() || isInLiquid() || this.mob.isPassenger());
+        return this.mob.isOnGround() || isInLiquid() || this.mob.isPassenger();
     }
 
     /*
@@ -156,7 +156,7 @@ public class EntityNavigation extends PathNavigation {
         }
         return true;
     }
-    
+
     private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7,
             double var9) {
         int var11 = var0 - var3 / 2;
@@ -188,19 +188,22 @@ public class EntityNavigation extends PathNavigation {
     public Path createPath(BlockPos var0, int var1) {
         if (this.level.getBlockState(var0).isAir()) {
             BlockPos var2 = var0.below();
-            while (var2.getY() > this.level.getMinBuildHeight() && this.level.getBlockState(var2).isAir())
+            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())
+            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())
+                    && this.level.getBlockState(var2).getMaterial().isSolid()) {
                 var2 = var2.above();
+            }
             return supercreatePath(var2, var1);
         }
         return supercreatePath(var0, var1);
@@ -228,7 +231,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected Path createPath(Set<BlockPos> var0, int var1, boolean var2, int var3, float var4) {
-        if (var0.isEmpty() || (this.mob.getY() < this.level.getMinBuildHeight()) || !canUpdatePath())
+        if (var0.isEmpty() || this.mob.getY() < this.level.getMinBuildHeight() || !canUpdatePath())
             return null;
         if (this.path != null && !this.path.isDone() && var0.contains(this.targetPos))
             return this.path;
@@ -276,10 +279,11 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.timeoutCachedNode = blockPos;
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
-                this.timeoutLimit = (this.mob.getSpeed() > 0.0F) ? (var2 / this.mob.getSpeed() * 1000.0D) : 0.0D;
+                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)
+            if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
+            }
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
     }
@@ -287,15 +291,16 @@ public class EntityNavigation extends PathNavigation {
     @Override
     protected void followThePath() {
         Vec3 var0 = getTempMobPos();
-        this.maxDistanceToWaypoint = (this.mob.getBbWidth() > 0.75F) ? (this.mob.getBbWidth() / 2.0F)
-                : (0.75F - this.mob.getBbWidth() / 2.0F);
+        this.maxDistanceToWaypoint = this.mob.getBbWidth() > 0.75F ? this.mob.getBbWidth() / 2.0F
+                : 0.75F - this.mob.getBbWidth() / 2.0F;
         BlockPos blockPos = this.path.getNextNodePos();
         double var2 = Math.abs(this.mob.getX() - (blockPos.getX() + 0.5D));
         double var4 = Math.abs(this.mob.getY() - blockPos.getY());
         double var6 = Math.abs(this.mob.getZ() - (blockPos.getZ() + 0.5D));
-        boolean var8 = (var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D);
-        if (var8 || (canCutCorner((this.path.getNextNode()).type) && shouldTargetNextNodeInDirection(var0)))
+        boolean var8 = var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D;
+        if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
+        }
         doStuckDetection(var0);
     }
 
@@ -344,19 +349,19 @@ public class EntityNavigation extends PathNavigation {
     }
 
     protected boolean hasValidPathType(BlockPathTypes var0) {
-        if ((var0 == BlockPathTypes.WATER) || (var0 == BlockPathTypes.LAVA) || (var0 == BlockPathTypes.OPEN))
+        if (var0 == BlockPathTypes.WATER || var0 == BlockPathTypes.LAVA || var0 == BlockPathTypes.OPEN)
             return false;
         return true;
     }
 
     @Override
     public boolean isDone() {
-        return (this.path == null || this.path.isDone());
+        return this.path == null || this.path.isDone();
     }
 
     @Override
     protected boolean isInLiquid() {
-        return (this.mob.isInWaterOrBubble() || this.mob.isInLava());
+        return this.mob.isInWaterOrBubble() || this.mob.isInLava();
     }
 
     @Override
@@ -383,7 +388,7 @@ public class EntityNavigation extends PathNavigation {
     @Override
     public boolean moveTo(Entity var0, double var1) {
         Path var3 = createPath(var0, 1);
-        return (var3 != null && moveTo(var3, var1));
+        return var3 != null && moveTo(var3, var1);
     }
 
     @Override
@@ -392,8 +397,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-        if (!var0.sameAs(this.path))
+        if (!var0.sameAs(this.path)) {
             this.path = var0;
+        }
         if (isDone())
             return false;
         trimPath();
@@ -465,15 +471,13 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     public boolean shouldRecomputePath(BlockPos var0) {
-        if (this.hasDelayedRecomputation) {
+        if (this.hasDelayedRecomputation || ((this.path == null) || this.path.isDone() || (this.path.getNodeCount() == 0)))
             return false;
-        } else if (this.path != null && !this.path.isDone() && this.path.getNodeCount() != 0) {
+        else {
             Node var1 = this.path.getEndNode();
             Vec3 var2 = new Vec3((var1.x + this.mob.getX()) / 2.0D, (var1.y + this.mob.getY()) / 2.0D,
                     (var1.z + this.mob.getZ()) / 2.0D);
             return var0.closerToCenterThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex());
-        } else {
-            return false;
         }
     }
 
@@ -486,7 +490,7 @@ public class EntityNavigation extends PathNavigation {
         Vec3 var2 = Vec3.atBottomCenterOf(this.path.getNodePos(this.path.getNextNodeIndex() + 1));
         Vec3 var3 = var2.subtract(var1);
         Vec3 var4 = var0.subtract(var1);
-        return (var3.dot(var4) > 0.0D);
+        return var3.dot(var4) > 0.0D;
     }
 
     @Override
@@ -503,12 +507,13 @@ public class EntityNavigation extends PathNavigation {
             return;
         for (int var0 = 0; var0 < this.path.getNodeCount(); var0++) {
             Node var1 = this.path.getNode(var0);
-            Node var2 = (var0 + 1 < this.path.getNodeCount()) ? this.path.getNode(var0 + 1) : null;
+            Node var2 = var0 + 1 < this.path.getNodeCount() ? this.path.getNode(var0 + 1) : null;
             BlockState var3 = this.level.getBlockState(new BlockPos(var1.x, var1.y, var1.z));
             if (var3.is(BlockTags.CAULDRONS)) {
                 this.path.replaceNode(var0, var1.cloneAndMove(var1.x, var1.y + 1, var1.z));
-                if (var2 != null && var1.y >= var2.y)
+                if (var2 != null && var1.y >= var2.y) {
                     this.path.replaceNode(var0 + 1, var1.cloneAndMove(var2.x, var1.y + 1, var2.z));
+                }
             }
         }
     }
@@ -527,8 +532,9 @@ public class EntityNavigation extends PathNavigation {
             Vec3 vec31 = getTempMobPos();
             Vec3 vec32 = this.path.getNextEntityPos(this.mob);
             if (vec31.y > vec32.y && !this.mob.isOnGround() && Mth.floor(vec31.x) == Mth.floor(vec32.x)
-                    && Mth.floor(vec31.z) == Mth.floor(vec32.z))
+                    && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
+            }
         }
         if (isDone())
             return;
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 f83a4e42d..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
@@ -34,15 +34,15 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
-    private final Long2ObjectMap<BlockPathTypes> l = new Long2ObjectOpenHashMap<BlockPathTypes>();
-    private final Object2BooleanMap<AABB> m = new Object2BooleanOpenHashMap<AABB>();
+    private final Long2ObjectMap<BlockPathTypes> l = new Long2ObjectOpenHashMap<>();
+    private final Object2BooleanMap<AABB> m = new Object2BooleanOpenHashMap<>();
     protected float oldWaterCost;
 
     private boolean canReachWithoutCollision(Node var0) {
         Vec3 var1 = new Vec3(var0.x - this.mob.getX(), var0.y - this.mob.getY(), var0.z - this.mob.getZ());
         AABB var2 = this.mob.getBoundingBox();
         int var3 = Mth.ceil(var1.length() / var2.getSize());
-        var1 = var1.scale((1.0F / var3));
+        var1 = var1.scale(1.0F / var3);
         for (int var4 = 1; var4 <= var3; var4++) {
             var2 = var2.move(var1);
             if (hasCollisions(var2))
@@ -61,17 +61,21 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
     protected BlockPathTypes evaluateBlockPathType(BlockGetter var0, boolean var1, boolean var2, BlockPos var3,
             BlockPathTypes var4) {
-        if (var4 == BlockPathTypes.DOOR_WOOD_CLOSED && var1 && var2)
+        if (var4 == BlockPathTypes.DOOR_WOOD_CLOSED && var1 && var2) {
             var4 = BlockPathTypes.WALKABLE_DOOR;
-        if (var4 == BlockPathTypes.DOOR_OPEN && !var2)
+        }
+        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))
+                        .getBlock() instanceof net.minecraft.world.level.block.BaseRailBlock)) {
             var4 = BlockPathTypes.UNPASSABLE_RAIL;
-        if (var4 == BlockPathTypes.LEAVES)
+        }
+        if (var4 == BlockPathTypes.LEAVES) {
             var4 = BlockPathTypes.BLOCKED;
+        }
         return var4;
     }
 
@@ -90,9 +94,10 @@ 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))
+        if (var7 == BlockPathTypes.FENCE && var8 != null && var8.costMalus >= 0.0F && !canReachWithoutCollision(var8)) {
             var8 = null;
-        if (var12 == BlockPathTypes.WALKABLE || (isAmphibious() && var12 == BlockPathTypes.WATER))
+        }
+        if (var12 == BlockPathTypes.WALKABLE || isAmphibious() && var12 == BlockPathTypes.WATER)
             return var8;
         if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0 && var12 != BlockPathTypes.FENCE
                 && var12 != BlockPathTypes.UNPASSABLE_RAIL && var12 != BlockPathTypes.TRAPDOOR
@@ -100,15 +105,16 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             var8 = findAcceptedNode(var0, var1 + 1, var2, var3 - 1, var4, var6, var7);
             if (var8 != null && (var8.type == BlockPathTypes.OPEN || var8.type == BlockPathTypes.WALKABLE)
                     && this.mob.getBbWidth() < 1.0F) {
-                double var16 = (var0 - var6.getStepX()) + 0.5D;
-                double var18 = (var2 - var6.getStepZ()) + 0.5D;
+                double var16 = var0 - var6.getStepX() + 0.5D;
+                double var18 = var2 - var6.getStepZ() + 0.5D;
                 AABB var20 = new AABB(var16 - var14,
-                        getFloorLevel(this.level, var9.set(var16, (var1 + 1), var18)) + 0.001D, var18 - var14,
+                        getFloorLevel(this.level, var9.set(var16, var1 + 1, var18)) + 0.001D, var18 - var14,
                         var16 + var14,
                         this.mob.getBbHeight() + getFloorLevel(this.level, var9.set(var8.x, var8.y, var8.z)) - 0.002D,
                         var18 + var14);
-                if (hasCollisions(var20))
+                if (hasCollisions(var20)) {
                     var8 = null;
+                }
             }
         }
         if (!isAmphibious() && var12 == BlockPathTypes.WATER && !canFloat()) {
@@ -187,8 +193,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         for (BlockPathTypes var15 : var10) {
             if (mvmt.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13))
+            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
@@ -210,8 +217,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         for (BlockPathTypes var15 : var10) {
             if (var4.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (var4.getPathfindingMalus(var15) >= var4.getPathfindingMalus(var13))
+            if (var4.getPathfindingMalus(var15) >= var4.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
@@ -236,8 +244,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         for (BlockPathTypes var15 : var10) {
             if (mvmt.getPathfindingMalus(var15) < 0.0F)
                 return var15;
-            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13))
+            if (mvmt.getPathfindingMalus(var15) >= mvmt.getPathfindingMalus(var13)) {
                 var13 = var15;
+            }
         }
         if (var11 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var13) == 0.0F && var5 <= 1)
             return BlockPathTypes.OPEN;
@@ -254,8 +263,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     int var17 = var14 + var3;
                     BlockPathTypes var18 = getBlockPathType(var0, var15, var16, var17);
                     var18 = evaluateBlockPathType(var0, var7, var8, var11, var18);
-                    if (var12 == 0 && var13 == 0 && var14 == 0)
+                    if (var12 == 0 && var13 == 0 && var14 == 0) {
                         var10 = var18;
+                    }
                     var9.add(var18);
                 }
             }
@@ -290,33 +300,42 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         int var3 = 0;
         BlockPathTypes var4 = getCachedBlockType(this.mob, var1.x, var1.y + 1, var1.z);
         BlockPathTypes var5 = getCachedBlockType(this.mob, var1.x, var1.y, var1.z);
-        if (this.mvmt.getPathfindingMalus(var4) >= 0.0F && var5 != BlockPathTypes.STICKY_HONEY)
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        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))
+        if (isDiagonalValid(var1, var10, var8, var15)) {
             var0[var2++] = var15;
+        }
         return var2;
     }
 
@@ -343,8 +362,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             BlockPos blockPos = this.mob.blockPosition();
             while ((this.level.getBlockState(blockPos).isAir() || this.level.getBlockState(blockPos)
                     .isPathfindable(this.level, blockPos, PathComputationType.LAND))
-                    && blockPos.getY() > this.mob.level.getMinBuildHeight())
+                    && blockPos.getY() > this.mob.level.getMinBuildHeight()) {
                 blockPos = blockPos.below();
+            }
             var0 = blockPos.above().getY();
         }
         BlockPos var3 = this.mob.blockPosition();
@@ -373,7 +393,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
     private boolean hasPositiveMalus(BlockPos var0) {
         BlockPathTypes var1 = getBlockPathType(this.mob, var0);
-        return (this.mvmt.getPathfindingMalus(var1) >= 0.0F);
+        return this.mvmt.getPathfindingMalus(var1) >= 0.0F;
     }
 
     protected boolean isAmphibious() {
@@ -388,14 +408,14 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         if (var1.type == BlockPathTypes.WALKABLE_DOOR || var2.type == BlockPathTypes.WALKABLE_DOOR
                 || var3.type == BlockPathTypes.WALKABLE_DOOR)
             return false;
-        boolean var4 = (var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
-                && this.mob.getBbWidth() < 0.5D);
-        return (var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
-                && (var1.y < var0.y || var1.costMalus >= 0.0F || var4));
+        boolean var4 = var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
+                && this.mob.getBbWidth() < 0.5D;
+        return var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
+                && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
     }
 
     protected boolean isNeighborValid(Node var0, Node var1) {
-        return (var0 != null && !var0.closed && (var0.costMalus >= 0.0F || var1.costMalus < 0.0F));
+        return var0 != null && !var0.closed && (var0.costMalus >= 0.0F || var1.costMalus < 0.0F);
     }
 
     @Override
@@ -464,8 +484,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             return BlockPathTypes.RAIL;
         if (var3 instanceof net.minecraft.world.level.block.LeavesBlock)
             return BlockPathTypes.LEAVES;
-        if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS) || (var3 instanceof FenceGateBlock
-                && !((Boolean) var2.getValue((Property<?>) FenceGateBlock.OPEN)).booleanValue()))
+        if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS) || var3 instanceof FenceGateBlock
+                && !((Boolean) var2.getValue((Property<?>) FenceGateBlock.OPEN)).booleanValue())
             return BlockPathTypes.FENCE;
         if (!var2.isPathfindable(var0, var1, PathComputationType.LAND))
             return BlockPathTypes.BLOCKED;
@@ -481,19 +501,24 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         BlockPathTypes var5 = getBlockPathTypeRaw(var0, var1);
         if (var5 == BlockPathTypes.OPEN && var3 >= var0.getMinBuildHeight() + 1) {
             BlockPathTypes var6 = getBlockPathTypeRaw(var0, var1.set(var2, var3 - 1, var4));
-            var5 = (var6 == BlockPathTypes.WALKABLE || var6 == BlockPathTypes.OPEN || var6 == BlockPathTypes.WATER
-                    || var6 == BlockPathTypes.LAVA) ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE;
-            if (var6 == BlockPathTypes.DAMAGE_FIRE)
+            var5 = var6 == BlockPathTypes.WALKABLE || var6 == BlockPathTypes.OPEN || var6 == BlockPathTypes.WATER
+                    || var6 == BlockPathTypes.LAVA ? BlockPathTypes.OPEN : BlockPathTypes.WALKABLE;
+            if (var6 == BlockPathTypes.DAMAGE_FIRE) {
                 var5 = BlockPathTypes.DAMAGE_FIRE;
-            if (var6 == BlockPathTypes.DAMAGE_CACTUS)
+            }
+            if (var6 == BlockPathTypes.DAMAGE_CACTUS) {
                 var5 = BlockPathTypes.DAMAGE_CACTUS;
-            if (var6 == BlockPathTypes.DAMAGE_OTHER)
+            }
+            if (var6 == BlockPathTypes.DAMAGE_OTHER) {
                 var5 = BlockPathTypes.DAMAGE_OTHER;
-            if (var6 == BlockPathTypes.STICKY_HONEY)
+            }
+            if (var6 == BlockPathTypes.STICKY_HONEY) {
                 var5 = BlockPathTypes.STICKY_HONEY;
+            }
         }
-        if (var5 == BlockPathTypes.WALKABLE)
+        if (var5 == BlockPathTypes.WALKABLE) {
             var5 = checkNeighbourBlocks(var0, var1.set(var2, var3, var4), var5);
+        }
         return var5;
     }
 
@@ -504,7 +529,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     public static boolean isBurningBlock(BlockState var0) {
-        return (var0.is(BlockTags.FIRE) || var0.is(Blocks.LAVA) || var0.is(Blocks.MAGMA_BLOCK)
-                || CampfireBlock.isLitCampfire(var0) || var0.is(Blocks.LAVA_CAULDRON));
+        return var0.is(BlockTags.FIRE) || var0.is(Blocks.LAVA) || var0.is(Blocks.MAGMA_BLOCK)
+                || CampfireBlock.isLitCampfire(var0) || var0.is(Blocks.LAVA_CAULDRON);
     }
 }
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluatorBase.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluatorBase.java
index eed8aacf8..daa4d2390 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluatorBase.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/EntityNodeEvaluatorBase.java
@@ -11,7 +11,7 @@ import net.minecraft.world.level.pathfinder.Node;
 import net.minecraft.world.level.pathfinder.NodeEvaluator;
 
 public abstract class EntityNodeEvaluatorBase extends NodeEvaluator {
-    protected final Int2ObjectMap<Node> c = new Int2ObjectOpenHashMap<Node>();
+    protected final Int2ObjectMap<Node> c = new Int2ObjectOpenHashMap<>();
     protected boolean canFloat;
     protected boolean canOpenDoors;
     protected boolean canPassDoors;
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 4f2baa0e5..f3eb89071 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
@@ -91,10 +91,12 @@ public class EntityPathfinder extends PathFinder {
                     var9.add(target);
                 }
             }
-            if (!var9.isEmpty())
+            if (!var9.isEmpty()) {
                 break;
-            if (node.distanceTo(var1) >= var3)
+            }
+            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];
@@ -136,12 +138,9 @@ public class EntityPathfinder extends PathFinder {
     }
 
     public Stream<Path> getFallbackDestinations(Map<Target, BlockPos> var1, Set<Target> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
+        return var5.stream().map(var1x -> this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
     }
 
     private Path reconstructPath(Node var0, BlockPos var1, boolean var2) {
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 1277ff0b2..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
@@ -168,9 +168,8 @@ public interface MobAI {
                     mob.getJumpControl().tick();
                 }
             };
-        } else if (handle instanceof 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 c491727e8..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
@@ -522,9 +522,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().getSessionService();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -565,9 +564,8 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -594,9 +592,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         MoveControl controller = handle instanceof Mob ? ((Mob) handle).getMoveControl()
                 : handle instanceof MobAI ? ((MobAI) handle).getMoveControl() : null;
-        if (controller == null || !controller.hasWanted()) {
+        if (controller == null || !controller.hasWanted())
             return null;
-        }
         return new Location(entity.getWorld(), controller.getWantedX(), controller.getWantedY(),
                 controller.getWantedZ());
     }
@@ -608,9 +605,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof org.bukkit.entity.LivingEntity)) {
+        if (!(entity instanceof org.bukkit.entity.LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((org.bukkit.entity.LivingEntity) entity).getYHeadRot();
     }
 
@@ -671,7 +667,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = NMSImpl.getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -683,9 +679,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_META_PROFILE == null) {
             SKULL_META_PROFILE = NMS.getFirstGetter(meta.getClass(), GameProfile.class);
-            if (SKULL_META_PROFILE == null) {
+            if (SKULL_META_PROFILE == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_META_PROFILE.invoke(meta);
@@ -718,8 +713,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof org.bukkit.entity.LivingEntity))
             return DEFAULT_SPEED;
         LivingEntity handle = NMSImpl.getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttribute(Attributes.d).getValue();
@@ -733,22 +728,18 @@ public class NMSImpl implements NMSBridge {
     @Override
     public MCNavigator getTargetNavigator(org.bukkit.entity.Entity entity, Iterable<Vector> dest,
             final NavigatorParameters params) {
-        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(dest, (input) -> {
-            return new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ());
-        }));
+        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(dest,
+                input -> new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ())));
         Node last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final Path path = new Path(list, last != null ? new BlockPos(last.x, last.y, last.z) : null, true);
-        return getTargetNavigator(entity, params, (input) -> {
-            return input.moveTo(path, params.speed());
-        });
+        return getTargetNavigator(entity, params, input -> input.moveTo(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, (input) -> {
-            return input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -854,11 +845,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -1050,7 +1040,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1062,8 +1052,9 @@ public class NMSImpl implements NMSBridge {
             double pitch = distanceY == 0 ? 0
                     : Math.toDegrees(Math.acos(yDiff / distanceY))
                             - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            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 {
@@ -1094,7 +1085,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             if (to instanceof org.bukkit.entity.LivingEntity) {
                 look(from, ((org.bukkit.entity.LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1141,14 +1132,12 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     this.bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(),
                             new CitizensInventoryAnvil(this.access.getLocation(), this.inputSlots, this.resultSlots,
                                     this, anvil),
                             this);
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.getBukkitView().setItem(0, anvil.getItem(0));
@@ -1191,8 +1180,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             net.minecraft.world.entity.EntityType<?> type = ENTITY_REGISTRY.findType(search);
             ResourceLocation key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1476,9 +1466,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SET_PROFILE_METHOD == null) {
             SET_PROFILE_METHOD = NMS.getMethodHandle(meta.getClass(), "setProfile", true, GameProfile.class);
-            if (SET_PROFILE_METHOD == null) {
+            if (SET_PROFILE_METHOD == null)
                 return;
-            }
         }
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
@@ -1759,9 +1748,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.moveTo(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1850,9 +1838,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1861,25 +1848,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.nbt.Tag base) {
-        if (base instanceof net.minecraft.nbt.IntTag) {
+        if (base instanceof net.minecraft.nbt.IntTag)
             return new IntTag(key, ((net.minecraft.nbt.IntTag) base).getAsInt());
-        } else if (base instanceof net.minecraft.nbt.FloatTag) {
+        else if (base instanceof net.minecraft.nbt.FloatTag)
             return new FloatTag(key, ((net.minecraft.nbt.FloatTag) base).getAsFloat());
-        } else if (base instanceof net.minecraft.nbt.DoubleTag) {
+        else if (base instanceof net.minecraft.nbt.DoubleTag)
             return new DoubleTag(key, ((net.minecraft.nbt.DoubleTag) base).getAsDouble());
-        } else if (base instanceof net.minecraft.nbt.LongTag) {
+        else if (base instanceof net.minecraft.nbt.LongTag)
             return new LongTag(key, ((net.minecraft.nbt.LongTag) base).getAsLong());
-        } else if (base instanceof net.minecraft.nbt.ShortTag) {
+        else if (base instanceof net.minecraft.nbt.ShortTag)
             return new ShortTag(key, ((net.minecraft.nbt.ShortTag) base).getAsShort());
-        } else if (base instanceof net.minecraft.nbt.ByteTag) {
+        else if (base instanceof net.minecraft.nbt.ByteTag)
             return new ByteTag(key, ((net.minecraft.nbt.ByteTag) base).getAsByte());
-        } else if (base instanceof net.minecraft.nbt.ByteArrayTag) {
+        else if (base instanceof net.minecraft.nbt.ByteArrayTag)
             return new ByteArrayTag(key, ((net.minecraft.nbt.ByteArrayTag) base).getAsByteArray());
-        } else if (base instanceof net.minecraft.nbt.IntArrayTag) {
+        else if (base instanceof net.minecraft.nbt.IntArrayTag)
             return new IntArrayTag(key, ((net.minecraft.nbt.IntArrayTag) base).getAsIntArray());
-        } else if (base instanceof net.minecraft.nbt.StringTag) {
+        else if (base instanceof net.minecraft.nbt.StringTag)
             return new StringTag(key, base.getAsString());
-        } else if (base instanceof net.minecraft.nbt.ListTag) {
+        else if (base instanceof net.minecraft.nbt.ListTag) {
             List<net.minecraft.nbt.Tag> list = (List<net.minecraft.nbt.Tag>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1889,19 +1876,17 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } else if (base instanceof net.minecraft.nbt.CompoundTag) {
-            return convertNBT(((net.minecraft.nbt.CompoundTag) base));
-        } else if (base instanceof net.minecraft.nbt.EndTag) {
+        } else if (base instanceof net.minecraft.nbt.CompoundTag)
+            return convertNBT((net.minecraft.nbt.CompoundTag) base);
+        else if (base instanceof net.minecraft.nbt.EndTag)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) {
         if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) {
             double d0 = 0.08D;
-            boolean flag = ((entity.getDeltaMovement()).y <= 0.0D);
+            boolean flag = entity.getDeltaMovement().y <= 0.0D;
             if (flag && entity.hasEffect(MobEffects.SLOW_FALLING)) {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
@@ -1912,27 +1897,32 @@ public class NMSImpl implements NMSBridge {
                 float f = entity.isSprinting() ? 0.9F : 0.8F;
                 float f1 = 0.02F;
                 float f2 = EnchantmentHelper.getDepthStrider(entity);
-                if (f2 > 3.0F)
+                if (f2 > 3.0F) {
                     f2 = 3.0F;
-                if (!entity.isOnGround())
+                }
+                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))
+                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())
+                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);
                 if (entity.horizontalCollision
-                        && entity.isFree(vec3d2.x, vec3d2.y + 0.6D - entity.getY() + d1, vec3d2.z))
+                        && 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);
@@ -1944,16 +1934,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-                if (!entity.isNoGravity())
+                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.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)
+                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);
@@ -1970,9 +1963,10 @@ public class NMSImpl implements NMSBridge {
                     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)
+                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) {
@@ -1989,13 +1983,14 @@ public class NMSImpl implements NMSBridge {
                     }
                 }
                 if (entity.isOnGround() && !entity.level.isClientSide && entity.getSharedFlag(7)
-                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
+                }
             } else {
-                BlockPos blockposition = new BlockPos(entity.getX(), (entity.getBoundingBox()).minY - 0.5D,
+                BlockPos blockposition = new BlockPos(entity.getX(), entity.getBoundingBox().minY - 0.5D,
                         entity.getZ());
                 float f5 = entity.level.getBlockState(blockposition).getBlock().getFriction();
-                float f = entity.isOnGround() ? (f5 * 0.91F) : 0.91F;
+                float f = entity.isOnGround() ? f5 * 0.91F : 0.91F;
                 Vec3 vec3d6 = entity.handleRelativeFrictionAndCalculateMovement(vec3d, f5);
                 double d7 = vec3d6.y;
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -2110,11 +2105,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, Mob handle, Vec3 vec3d) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
-            handle.moveRelative((handle instanceof Dolphin || handle instanceof Axolotl) ? handle.getSpeed()
+            handle.moveRelative(handle instanceof Dolphin || handle instanceof Axolotl ? handle.getSpeed()
                     : handle instanceof Turtle ? 0.1F : 0.01F, vec3d);
             handle.move(MoverType.SELF, handle.getDeltaMovement());
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
@@ -2164,7 +2158,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2173,8 +2167,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
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 c88ed6389..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
@@ -74,17 +74,15 @@ public class AllayController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -167,7 +165,7 @@ public class AllayController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -200,11 +198,10 @@ public class AllayController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -248,9 +245,8 @@ public class AllayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fe22868ee..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
@@ -83,9 +83,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -144,9 +143,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 04dd3689c..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
@@ -81,17 +81,15 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -165,7 +163,7 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,9 +174,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected Brain<?> makeBrain(Dynamic<?> dynamic) {
-            if (npc == null || npc.useMinecraftAI()) {
+            if (npc == null || npc.useMinecraftAI())
                 return super.makeBrain(dynamic);
-            }
             return brainProvider().makeBrain(dynamic);
         }
 
@@ -187,19 +184,17 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET) {
+            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET)
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -215,8 +210,9 @@ public class AxolotlController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -259,9 +255,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 58fbddef7..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
@@ -64,9 +64,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -146,7 +145,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -187,9 +186,8 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c40d04814..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
@@ -61,9 +61,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -143,7 +142,7 @@ public class BeeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -184,9 +183,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3dfb8d836..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
@@ -61,9 +61,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -138,7 +137,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -179,9 +178,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 87617af45..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
@@ -66,6 +66,7 @@ public class CamelController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityCamelNPC(EntityType<? extends Camel> types, Level level) {
             this(types, level, null);
         }
@@ -82,17 +83,15 @@ public class CamelController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -179,9 +178,8 @@ public class CamelController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -203,7 +201,7 @@ public class CamelController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -214,11 +212,10 @@ public class CamelController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -271,9 +268,8 @@ public class CamelController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 112140325..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
@@ -64,17 +64,15 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class CatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,9 +222,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0659a5dbd..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
@@ -63,17 +63,15 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e54df1c0d..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
@@ -72,17 +72,15 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -165,7 +163,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,11 +174,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -233,9 +230,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e3359dba7..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
@@ -88,17 +88,15 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -192,7 +190,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -206,19 +204,17 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -264,9 +260,8 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6a4c28dd9..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
@@ -69,17 +69,15 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -162,7 +160,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,19 +174,17 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -241,9 +237,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 90a81c553..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
@@ -66,17 +66,15 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -166,7 +164,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -177,11 +175,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -197,8 +194,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -244,9 +242,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e56195e8e..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
@@ -75,17 +75,15 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +162,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,11 +173,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -244,9 +241,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 298daa360..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
@@ -63,17 +63,15 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -187,8 +184,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -214,9 +212,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 35cc70d18..f2621a326 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
@@ -153,9 +153,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -222,7 +221,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -244,8 +243,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -275,9 +275,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f9dbfa6bb..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
@@ -66,17 +66,15 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -159,7 +157,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,11 +168,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -190,16 +187,16 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
         public Optional<Boolean> randomTeleport(double d0, double d1, double d2, boolean flag,
                 PlayerTeleportEvent.TeleportCause cause) {
-            if (npc == null) {
+            if (npc == null)
                 return super.randomTeleport(d0, d1, d2, flag, cause);
-            }
             return Optional.of(false);
         }
 
@@ -235,9 +232,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c1d3cc0b0..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
@@ -63,17 +63,15 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -187,8 +184,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -223,9 +221,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b289bd6b3..4b2a57cc4 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
@@ -83,9 +83,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.causeFallDamage(f, f1, damagesource);
-        }
         return false;
     }
 
@@ -100,9 +99,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
         Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> {
             EntityHumanNPC.this.getLevel().removePlayerImmediately(EntityHumanNPC.this, RemovalReason.KILLED);
@@ -211,9 +209,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public Component getTabListDisplayName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return MutableComponent.create(new LiteralContents(""));
-        }
         return super.getTabListDisplayName();
     }
 
@@ -225,12 +222,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         boolean damaged = super.hurt(damagesource, f);
         if (damaged && hurtMarked) {
             hurtMarked = false;
-            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), new Runnable() {
-                @Override
-                public void run() {
-                    EntityHumanNPC.this.hurtMarked = true;
-                }
-            });
+            Bukkit.getScheduler().runTask(CitizensAPI.getPlugin(), (Runnable) () -> EntityHumanNPC.this.hurtMarked = true);
         }
         return damaged;
     }
@@ -253,9 +245,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean isInWall() {
-        if (npc == null || noPhysics || isSleeping()) {
+        if (npc == null || noPhysics || isSleeping())
             return super.isInWall();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -266,7 +257,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public void knockback(double strength, double dx, double dz) {
-        NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+        NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                 evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
     }
 
@@ -298,11 +289,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean onClimbable() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.onClimbable();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -402,9 +392,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
         @Override
         public boolean canSee(org.bukkit.entity.Entity entity) {
-            if (entity != null && entity.getType().name().contains("ITEM_FRAME")) {
+            if (entity != null && entity.getType().name().contains("ITEM_FRAME"))
                 return false; // optimise for large maps in item frames
-            }
             return super.canSee(entity);
         }
 
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 8c1950e01..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
@@ -57,17 +57,15 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -209,9 +206,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 15323beeb..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
@@ -58,17 +58,15 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b45f8f08c..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
@@ -61,17 +61,15 @@ public class FrogController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class FrogController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class FrogController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -222,9 +219,8 @@ public class FrogController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0357e1177..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
@@ -55,9 +55,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -138,7 +137,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -179,9 +178,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 180e562f2..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
@@ -57,17 +57,15 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3fb500bad..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
@@ -57,17 +57,15 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class GlowSquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 23ee3b8c6..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
@@ -58,17 +58,15 @@ public class GoatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class GoatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a4d02ee85..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
@@ -72,17 +72,15 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e754d8728..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
@@ -72,17 +72,15 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2b21308ed..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
@@ -60,17 +60,15 @@ public class HoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -187,8 +184,9 @@ public class HoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -214,9 +212,8 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 bbf9ec27b..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
@@ -77,17 +77,15 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -174,9 +172,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -198,7 +195,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -209,11 +206,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -266,9 +262,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 223e74267..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
@@ -60,6 +60,7 @@ public class HorseDonkeyController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseDonkeyNPC(EntityType<? extends Donkey> types, Level level) {
             this(types, level, null);
         }
@@ -76,17 +77,15 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -173,9 +172,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +195,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +206,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +262,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 63e3ac52c..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
@@ -77,17 +77,15 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -174,9 +172,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -198,7 +195,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -209,11 +206,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -266,9 +262,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d047efc80..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
@@ -77,17 +77,15 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -174,9 +172,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -198,7 +195,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -209,11 +206,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -266,9 +262,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 96b1e75f7..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
@@ -77,17 +77,15 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -174,9 +172,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -198,7 +195,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -209,11 +206,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -266,9 +262,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6047301cf..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
@@ -23,7 +23,6 @@ import net.minecraft.server.level.ServerLevel;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
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 55a309f65..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
@@ -57,17 +57,15 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -209,9 +206,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ae61e61f1..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
@@ -57,17 +57,15 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fc1f397a6..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
@@ -60,6 +60,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityType<? extends Llama> types, Level level) {
             this(types, level, null);
         }
@@ -76,17 +77,15 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -173,9 +172,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +195,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +206,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +262,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7186de5f8..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
@@ -67,17 +67,15 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,8 +186,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -240,9 +238,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 301d04c79..7d94b042a 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
@@ -78,5 +78,5 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
 }
\ No newline at end of file
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 d4edfa340..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
@@ -61,17 +61,15 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -172,11 +170,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -201,8 +198,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -228,9 +226,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4f2562896..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
@@ -59,17 +59,15 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,9 +222,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c1f77d178..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
@@ -58,17 +58,15 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 df4d075af..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
@@ -58,9 +58,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -140,7 +139,7 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -152,9 +151,8 @@ public class ParrotController extends MobEntityController {
         @Override
         public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
-            }
             return InteractionResult.FAIL;
         }
 
@@ -190,9 +188,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8cf80e0c0..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
@@ -92,17 +92,15 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -183,7 +181,7 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -194,11 +192,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,8 +220,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -255,9 +253,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3db8468ee..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
@@ -59,17 +59,15 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -158,7 +156,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,11 +167,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -233,9 +230,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 69cc75bee..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
@@ -57,17 +57,15 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 da5ae4a3e..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
@@ -57,17 +57,15 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,11 +162,10 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -184,8 +181,9 @@ public class PiglinBruteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -211,9 +209,8 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 78d61e6a1..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
@@ -57,17 +57,15 @@ public class PiglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,11 +162,10 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -184,8 +181,9 @@ public class PiglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -211,9 +209,8 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 88a154a2f..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
@@ -58,17 +58,15 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b45088bd7..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
@@ -56,9 +56,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -134,7 +133,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -184,9 +183,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9f593944e..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
@@ -88,17 +88,15 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,9 +149,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public EntityDimensions getDimensions(Pose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.getDimensions(entitypose);
-            }
             return super.getDimensions(entitypose).scale(1 / s(getPuffState())).scale(0.5F);
         }
 
@@ -195,7 +192,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -209,19 +206,17 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -279,9 +274,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 deef91f52..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
@@ -59,17 +59,15 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -160,7 +158,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -171,11 +169,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -239,9 +236,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 62082d3e4..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
@@ -58,17 +58,15 @@ public class RavagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,12 +149,12 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean isVehicle() {
-            return (npc == null || npc.useMinecraftAI()) ? super.isVehicle() : false;
+            return npc == null || npc.useMinecraftAI() ? super.isVehicle() : false;
         }
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 79975290b..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
@@ -82,17 +82,15 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -184,7 +182,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,19 +196,17 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -226,8 +222,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -255,9 +252,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a4641b71c..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
@@ -58,17 +58,15 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -191,8 +188,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -218,9 +216,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8354c4423..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
@@ -65,17 +65,15 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -154,7 +152,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -165,11 +163,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -185,8 +182,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -234,9 +232,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2f43c302b..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
@@ -57,17 +57,15 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 10ea2715e..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
@@ -57,17 +57,15 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 66397cbe4..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
@@ -57,17 +57,15 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7dacaa9d7..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
@@ -57,17 +57,15 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 847edccf8..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
@@ -67,17 +67,15 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -241,9 +238,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5ea462ce4..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
@@ -63,17 +63,15 @@ public class SnifferController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class SnifferController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,19 +168,17 @@ public class SnifferController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -235,9 +231,8 @@ public class SnifferController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fe782fb14..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
@@ -57,17 +57,15 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 597b9d443..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
@@ -57,17 +57,15 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5af23bbe2..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
@@ -57,17 +57,15 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2b593f227..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
@@ -57,17 +57,15 @@ public class StriderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class StriderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class StriderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4a829662c..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
@@ -83,17 +83,15 @@ public class TadpoleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -184,7 +182,7 @@ public class TadpoleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,19 +196,17 @@ public class TadpoleController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if ((Frog.TEMPTATION_ITEM.test(itemstack) || itemstack.getItem() == Items.WATER_BUCKET) && isAlive()) {
+            if ((Frog.TEMPTATION_ITEM.test(itemstack) || itemstack.getItem() == Items.WATER_BUCKET) && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -226,8 +222,9 @@ public class TadpoleController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -255,9 +252,8 @@ public class TadpoleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 fa1423e4d..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
@@ -70,17 +70,15 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -169,7 +167,7 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -180,11 +178,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -237,9 +234,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 72e2ee723..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
@@ -82,17 +82,15 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -186,7 +184,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -200,19 +198,17 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -228,8 +224,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -257,9 +254,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 19a9bd90a..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
@@ -71,17 +71,15 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -172,7 +170,7 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -183,11 +181,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -233,9 +230,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e1423e50d..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
@@ -58,9 +58,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -136,7 +135,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -177,9 +176,8 @@ public class VexController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4ed46aa20..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
@@ -69,17 +69,15 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -176,7 +174,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -199,11 +197,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -263,9 +260,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5990796f3..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
@@ -58,17 +58,15 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -219,9 +216,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a94231e7e..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
@@ -67,17 +67,15 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -176,7 +174,7 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -199,11 +197,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -267,9 +264,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a1891080d..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
@@ -60,17 +60,15 @@ public class WardenController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class WardenController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class WardenController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class WardenController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7e1ee82bc..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
@@ -57,17 +57,15 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c105f8077..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
@@ -55,9 +55,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -148,7 +147,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,8 +169,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -188,9 +188,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 26eff3542..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
@@ -60,17 +60,15 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,11 +162,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -226,9 +223,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 890829de3..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
@@ -57,17 +57,15 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class ZoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -210,9 +208,8 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 68858bcdd..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
@@ -57,17 +57,15 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7fd8a830f..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
@@ -57,17 +57,15 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -181,8 +178,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -208,9 +206,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7793fc1c7..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
@@ -57,17 +57,15 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -209,9 +206,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ce10a5610..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
@@ -125,9 +125,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 209c0c2de..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
@@ -137,9 +137,8 @@ public class BlockDisplayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 bf4fb51da..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
@@ -89,7 +89,7 @@ public class BoatController extends MobEntityController {
         private Status getStatus() {
             Status entityboat_Status = u();
             if (entityboat_Status != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
             if (t())
@@ -165,7 +165,7 @@ public class BoatController extends MobEntityController {
                         if (fluid.is(FluidTags.WATER)) {
                             float f = l1 + fluid.getHeight(this.level, blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -191,7 +191,7 @@ public class BoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == Status.IN_AIR && this.aE != Status.IN_AIR && this.aE != Status.ON_LAND) {
                     this.aC = getY(1.0D);
-                    setPos(getX(), (getWaterLevelAbove() - getBbHeight()) + 0.101D, getZ());
+                    setPos(getX(), getWaterLevelAbove() - getBbHeight() + 0.101D, getZ());
                     setDeltaMovement(getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                     this.aE = Status.IN_WATER;
                 } else {
@@ -217,7 +217,7 @@ public class BoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3 vec3d1 = getDeltaMovement();
-                        setDeltaMovement(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(MoverType.SELF, getDeltaMovement());
@@ -245,8 +245,8 @@ public class BoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.set(k1, l1, i2);
                         FluidState fluid = this.level.getFluidState(blockposition_mutableblockposition);
-                        if (fluid.is(FluidTags.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.level, blockposition_mutableblockposition))) {
+                        if (fluid.is(FluidTags.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.level, blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
@@ -259,9 +259,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 98c220886..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
@@ -90,7 +90,7 @@ public class ChestBoatController extends MobEntityController {
         private Status getStatus() {
             Status entityboat_Status = u();
             if (entityboat_Status != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
             if (t())
@@ -166,7 +166,7 @@ public class ChestBoatController extends MobEntityController {
                         if (fluid.is(FluidTags.WATER)) {
                             float f = l1 + fluid.getHeight(this.level, blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -192,7 +192,7 @@ public class ChestBoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == Status.IN_AIR && this.aE != Status.IN_AIR && this.aE != Status.ON_LAND) {
                     this.aC = getY(1.0D);
-                    setPos(getX(), (getWaterLevelAbove() - getBbHeight()) + 0.101D, getZ());
+                    setPos(getX(), getWaterLevelAbove() - getBbHeight() + 0.101D, getZ());
                     setDeltaMovement(getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                     this.aE = Status.IN_WATER;
                 } else {
@@ -218,7 +218,7 @@ public class ChestBoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3 vec3d1 = getDeltaMovement();
-                        setDeltaMovement(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(MoverType.SELF, getDeltaMovement());
@@ -246,8 +246,8 @@ public class ChestBoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.set(k1, l1, i2);
                         FluidState fluid = this.level.getFluidState(blockposition_mutableblockposition);
-                        if (fluid.is(FluidTags.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.level, blockposition_mutableblockposition))) {
+                        if (fluid.is(FluidTags.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.level, blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
@@ -260,9 +260,8 @@ public class ChestBoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 038c27e2a..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
@@ -137,9 +137,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 bcee848dc..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
@@ -142,9 +142,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f6a3ea191..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
@@ -125,9 +125,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9f3800e94..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
@@ -129,9 +129,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 aa00744e1..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
@@ -126,9 +126,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 bcf1d2db3..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
@@ -73,9 +73,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -133,9 +132,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4ab9f7a53..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
@@ -119,9 +119,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 32ab13000..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
@@ -150,9 +150,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6baea24a7..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
@@ -120,9 +120,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 023ad99f7..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
@@ -76,9 +76,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public double distanceToSqr(Entity entity) {
-            if (entity == getPlayerOwner()) {
+            if (entity == getPlayerOwner())
                 return 0D;
-            }
             return super.distanceToSqr(entity);
         }
 
@@ -154,9 +153,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 294f4b369..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
@@ -136,9 +136,8 @@ public class GlowItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0b789cd4a..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
@@ -119,9 +119,8 @@ public class InteractionController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7516f9f6e..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
@@ -139,9 +139,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e6a0904d3..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
@@ -131,9 +131,8 @@ public class ItemDisplayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3eb19a23d..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
@@ -135,9 +135,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8cf525ea8..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
@@ -131,9 +131,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 da5d8c8dc..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
@@ -125,9 +125,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7dcc0d306..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
@@ -139,9 +139,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f45547b39..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
@@ -119,9 +119,8 @@ public class MarkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ba7049a86..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
@@ -120,9 +120,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ec9d1482c..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
@@ -120,9 +120,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 65459b73a..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
@@ -120,9 +120,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 41c410114..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
@@ -107,9 +107,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e30a5fcf2..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
@@ -119,9 +119,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5fe5f732a..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
@@ -107,9 +107,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e2a4b27e7..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
@@ -107,9 +107,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 00499fcb3..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
@@ -124,9 +124,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 301784ada..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
@@ -119,9 +119,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f68147b6c..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
@@ -122,9 +122,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 219c9fde3..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
@@ -119,9 +119,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a4be91d6a..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
@@ -120,9 +120,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 cfd13e9f3..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
@@ -120,9 +120,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4d695048e..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
@@ -118,9 +118,8 @@ public class TextDisplayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e673d63ac..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
@@ -123,9 +123,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 33066948c..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
@@ -124,9 +124,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 dc90c383c..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
@@ -120,9 +120,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5d1284c6d..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
@@ -119,9 +119,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 98efade98..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
@@ -119,9 +119,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 25867f5bc..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     protected float getStrength(BlockState block) {
         float base = block.getDestroySpeed(null, BlockPos.ZERO);
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(BlockState block) {
-        if (block.requiresCorrectToolForDrops()) {
+        if (block.requiresCorrectToolForDrops())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java
index f6145d15c..c5b3b96f0 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CustomEntityRegistry.java
@@ -223,9 +223,8 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
 
     @Override
     public EntityType get(ResourceLocation key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
@@ -241,17 +240,15 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
 
     @Override
     public int getId(EntityType key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.getId(key);
     }
 
     @Override
     public ResourceLocation getKey(EntityType value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey(value);
     }
 
@@ -262,9 +259,8 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
 
     @Override
     public Optional<EntityType<?>> getOptional(ResourceLocation var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return this.wrapped.getOptional(var0);
     }
 
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 bcf1f99c5..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
@@ -68,9 +68,9 @@ public class EntityMoveControl extends MoveControl {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
@@ -94,10 +94,9 @@ public class EntityMoveControl extends MoveControl {
             double dZ = this.tz - this.entity.getZ();
             double dY = this.ty - this.entity.getY();
             double dXZ = Math.sqrt(dX * dX + dZ * dZ);
-            if (Math.abs(dY) < 1.0 && dXZ < 0.01) {
+            if (Math.abs(dY) < 1.0 && dXZ < 0.01)
                 // this.entity.zza = 0.0F;
                 return;
-            }
             if (dXZ > 0.4) {
                 float f = (float) Math.toDegrees(Mth.atan2(dZ, dX)) - 90.0F;
                 this.entity.setYRot(rotlerp(this.entity.getYRot(), f, 90.0F));
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 16f6843de..51f1aa5f4 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
@@ -66,8 +66,8 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     public boolean canCutCorner(BlockPathTypes pathtype) {
-        return (pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_POWDER_SNOW
-                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR);
+        return pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_POWDER_SNOW
+                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR;
     }
 
     @Override
@@ -137,7 +137,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected boolean canUpdatePath() {
-        return (this.mob.isOnGround() || isInLiquid() || this.mob.isPassenger());
+        return this.mob.isOnGround() || isInLiquid() || this.mob.isPassenger();
     }
 
     /*
@@ -154,7 +154,7 @@ public class EntityNavigation extends PathNavigation {
         }
         return true;
     }
-    
+
     private boolean canWalkOn(int var0, int var1, int var2, int var3, int var4, int var5, Vec3 var6, double var7,
             double var9) {
         int var11 = var0 - var3 / 2;
@@ -186,19 +186,22 @@ public class EntityNavigation extends PathNavigation {
     public Path createPath(BlockPos var0, int var1) {
         if (this.level.getBlockState(var0).isAir()) {
             BlockPos var2 = var0.below();
-            while (var2.getY() > this.level.getMinBuildHeight() && this.level.getBlockState(var2).isAir())
+            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())
+            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())
+                    && this.level.getBlockState(var2).getMaterial().isSolid()) {
                 var2 = var2.above();
+            }
             return supercreatePath(var2, var1);
         }
         return supercreatePath(var0, var1);
@@ -226,7 +229,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected Path createPath(Set<BlockPos> var0, int var1, boolean var2, int var3, float var4) {
-        if (var0.isEmpty() || (this.mob.getY() < this.level.getMinBuildHeight()) || !canUpdatePath())
+        if (var0.isEmpty() || this.mob.getY() < this.level.getMinBuildHeight() || !canUpdatePath())
             return null;
         if (this.path != null && !this.path.isDone() && var0.contains(this.targetPos))
             return this.path;
@@ -275,10 +278,11 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.timeoutCachedNode = blockPos;
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
-                this.timeoutLimit = (this.mob.getSpeed() > 0.0F) ? (var2 / this.mob.getSpeed() * 1000.0D) : 0.0D;
+                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)
+            if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
+            }
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
     }
@@ -286,15 +290,16 @@ public class EntityNavigation extends PathNavigation {
     @Override
     protected void followThePath() {
         Vec3 var0 = getTempMobPos();
-        this.maxDistanceToWaypoint = (this.mob.getBbWidth() > 0.75F) ? (this.mob.getBbWidth() / 2.0F)
-                : (0.75F - this.mob.getBbWidth() / 2.0F);
+        this.maxDistanceToWaypoint = this.mob.getBbWidth() > 0.75F ? this.mob.getBbWidth() / 2.0F
+                : 0.75F - this.mob.getBbWidth() / 2.0F;
         BlockPos blockPos = this.path.getNextNodePos();
         double var2 = Math.abs(this.mob.getX() - (blockPos.getX() + 0.5D));
         double var4 = Math.abs(this.mob.getY() - blockPos.getY());
         double var6 = Math.abs(this.mob.getZ() - (blockPos.getZ() + 0.5D));
-        boolean var8 = (var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D);
-        if (var8 || (canCutCorner((this.path.getNextNode()).type) && shouldTargetNextNodeInDirection(var0)))
+        boolean var8 = var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D;
+        if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
+        }
         doStuckDetection(var0);
     }
 
@@ -324,9 +329,8 @@ public class EntityNavigation extends PathNavigation {
             int var2 = 0;
 
             do {
-                if (!var1.is(Blocks.WATER)) {
+                if (!var1.is(Blocks.WATER))
                     return var0;
-                }
 
                 ++var0;
                 var1 = this.level.getBlockState(BlockPos.containing(this.mob.getX(), var0, this.mob.getZ()));
@@ -334,9 +338,8 @@ public class EntityNavigation extends PathNavigation {
             } while (var2 <= 16);
 
             return this.mob.getBlockY();
-        } else {
+        } else
             return Mth.floor(this.mob.getY() + 0.5);
-        }
     }
 
     @Override
@@ -350,23 +353,20 @@ public class EntityNavigation extends PathNavigation {
     }
 
     protected boolean hasValidPathType(BlockPathTypes var0) {
-        if (var0 == BlockPathTypes.WATER) {
+        if ((var0 == BlockPathTypes.WATER) || (var0 == BlockPathTypes.LAVA))
             return false;
-        } else if (var0 == BlockPathTypes.LAVA) {
-            return false;
-        } else {
+        else
             return var0 != BlockPathTypes.OPEN;
-        }
     }
 
     @Override
     public boolean isDone() {
-        return (this.path == null || this.path.isDone());
+        return this.path == null || this.path.isDone();
     }
 
     @Override
     protected boolean isInLiquid() {
-        return (this.mob.isInWaterOrBubble() || this.mob.isInLava());
+        return this.mob.isInWaterOrBubble() || this.mob.isInLava();
     }
 
     @Override
@@ -393,7 +393,7 @@ public class EntityNavigation extends PathNavigation {
     @Override
     public boolean moveTo(Entity var0, double var1) {
         Path var3 = createPath(var0, 1);
-        return (var3 != null && moveTo(var3, var1));
+        return var3 != null && moveTo(var3, var1);
     }
 
     @Override
@@ -402,8 +402,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-        if (!var0.sameAs(this.path))
+        if (!var0.sameAs(this.path)) {
             this.path = var0;
+        }
         if (isDone())
             return false;
         trimPath();
@@ -475,15 +476,13 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     public boolean shouldRecomputePath(BlockPos var0) {
-        if (this.hasDelayedRecomputation) {
+        if (this.hasDelayedRecomputation || ((this.path == null) || this.path.isDone() || (this.path.getNodeCount() == 0)))
             return false;
-        } else if (this.path != null && !this.path.isDone() && this.path.getNodeCount() != 0) {
+        else {
             Node var1 = this.path.getEndNode();
             Vec3 var2 = new Vec3((var1.x + this.mob.getX()) / 2.0D, (var1.y + this.mob.getY()) / 2.0D,
                     (var1.z + this.mob.getZ()) / 2.0D);
             return var0.closerToCenterThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex());
-        } else {
-            return false;
         }
     }
 
@@ -496,7 +495,7 @@ public class EntityNavigation extends PathNavigation {
         Vec3 var2 = Vec3.atBottomCenterOf(this.path.getNodePos(this.path.getNextNodeIndex() + 1));
         Vec3 var3 = var2.subtract(var1);
         Vec3 var4 = var0.subtract(var1);
-        return (var3.dot(var4) > 0.0D);
+        return var3.dot(var4) > 0.0D;
     }
 
     @Override
@@ -538,8 +537,9 @@ public class EntityNavigation extends PathNavigation {
             Vec3 vec31 = getTempMobPos();
             Vec3 vec32 = this.path.getNextEntityPos(this.mob);
             if (vec31.y > vec32.y && !this.mob.isOnGround() && Mth.floor(vec31.x) == Mth.floor(vec32.x)
-                    && Mth.floor(vec31.z) == Mth.floor(vec32.z))
+                    && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
+            }
         }
         if (isDone())
             return;
@@ -556,9 +556,8 @@ public class EntityNavigation extends PathNavigation {
     protected void trimPath() {
         supertrimPath();
         if (this.avoidSun) {
-            if (this.level.canSeeSky(BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ()))) {
+            if (this.level.canSeeSky(BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ())))
                 return;
-            }
 
             for (int var0 = 0; var0 < this.path.getNodeCount(); ++var0) {
                 Node var1 = this.path.getNode(var0);
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 88078c689..98aa523b4 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
@@ -50,9 +50,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
         for (int var4 = 1; var4 <= var3; ++var4) {
             var1 = var1.move(var2);
-            if (this.hasCollisions(var1)) {
+            if (this.hasCollisions(var1))
                 return false;
-            }
         }
 
         return true;
@@ -94,9 +93,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         Node var8 = null;
         BlockPos.MutableBlockPos var9 = new BlockPos.MutableBlockPos();
         double var10 = this.getFloorLevel(var9.set(var0, var1, var2));
-        if (var10 - var4 > this.getMobJumpHeight()) {
+        if (var10 - var4 > this.getMobJumpHeight())
             return null;
-        } else {
+        else {
             BlockPathTypes var12 = this.getCachedBlockType(this.mob, var0, var1, var2);
             float var13 = this.mvmt.getPathfindingMalus(var12);
             double var14 = this.mob.getBbWidth() / 2.0;
@@ -110,8 +109,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             }
 
             if (var12 == BlockPathTypes.WALKABLE || this.isAmphibious() && var12 == BlockPathTypes.WATER) {
-                return var8;
-            } else {
                 if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0
                         && (var12 != BlockPathTypes.FENCE || this.canWalkOverFences())
                         && var12 != BlockPathTypes.UNPASSABLE_RAIL && var12 != BlockPathTypes.TRAPDOOR
@@ -135,16 +132,14 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 }
 
                 if (!this.isAmphibious() && var12 == BlockPathTypes.WATER && !this.canFloat()) {
-                    if (this.getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER) {
+                    if (this.getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER)
                         return var8;
-                    }
 
                     while (var1 > this.mob.level.getMinBuildHeight()) {
                         --var1;
                         var12 = this.getCachedBlockType(this.mob, var0, var1, var2);
-                        if (var12 != BlockPathTypes.WATER) {
+                        if (var12 != BlockPathTypes.WATER)
                             return var8;
-                        }
 
                         var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12,
                                 this.mvmt.getPathfindingMalus(var12));
@@ -157,13 +152,11 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
                     while (var12 == BlockPathTypes.OPEN) {
                         --var1;
-                        if (var1 < this.mob.level.getMinBuildHeight()) {
+                        if (var1 < this.mob.level.getMinBuildHeight())
                             return this.getBlockedNode(var0, var17, var2);
-                        }
 
-                        if (var16++ >= this.mob.getMaxFallDistance()) {
+                        if (var16++ >= this.mob.getMaxFallDistance())
                             return this.getBlockedNode(var0, var1, var2);
-                        }
 
                         var12 = this.getCachedBlockType(this.mob, var0, var1, var2);
                         var13 = this.mvmt.getPathfindingMalus(var12);
@@ -172,9 +165,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                             break;
                         }
 
-                        if (var13 < 0.0F) {
+                        if (var13 < 0.0F)
                             return this.getBlockedNode(var0, var1, var2);
-                        }
                     }
                 }
 
@@ -184,9 +176,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var8.type = var12;
                     var8.costMalus = var12.getMalus();
                 }
-
-                return var8;
             }
+            return var8;
         }
     }
 
@@ -206,30 +197,28 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         EnumSet var5 = EnumSet.noneOf(BlockPathTypes.class);
         BlockPathTypes var6 = BlockPathTypes.BLOCKED;
         var6 = this.getBlockPathTypes(var0, var1, var2, var3, var5, var6, var4.blockPosition());
-        if (var5.contains(BlockPathTypes.FENCE)) {
+        if (var5.contains(BlockPathTypes.FENCE))
             return BlockPathTypes.FENCE;
-        } else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL)) {
+        else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL))
             return BlockPathTypes.UNPASSABLE_RAIL;
-        } else {
+        else {
             BlockPathTypes var7 = BlockPathTypes.BLOCKED;
             Iterator var9 = var5.iterator();
 
             while (var9.hasNext()) {
                 BlockPathTypes varr9 = (BlockPathTypes) var9.next();
-                if (mvmt.getPathfindingMalus(varr9) < 0.0F) {
+                if (mvmt.getPathfindingMalus(varr9) < 0.0F)
                     return varr9;
-                }
 
                 if (mvmt.getPathfindingMalus(varr9) >= mvmt.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
             }
 
-            if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1) {
+            if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
-            } else {
+            else
                 return var7;
-            }
         }
     }
 
@@ -238,30 +227,28 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         EnumSet var5 = EnumSet.noneOf(BlockPathTypes.class);
         BlockPathTypes var6 = BlockPathTypes.BLOCKED;
         var6 = this.getBlockPathTypes(var0, var1, var2, var3, var5, var6, var4.blockPosition());
-        if (var5.contains(BlockPathTypes.FENCE)) {
+        if (var5.contains(BlockPathTypes.FENCE))
             return BlockPathTypes.FENCE;
-        } else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL)) {
+        else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL))
             return BlockPathTypes.UNPASSABLE_RAIL;
-        } else {
+        else {
             BlockPathTypes var7 = BlockPathTypes.BLOCKED;
             Iterator var9 = var5.iterator();
 
             while (var9.hasNext()) {
                 BlockPathTypes varr9 = (BlockPathTypes) var9.next();
-                if (var4.getPathfindingMalus(varr9) < 0.0F) {
+                if (var4.getPathfindingMalus(varr9) < 0.0F)
                     return varr9;
-                }
 
                 if (var4.getPathfindingMalus(varr9) >= var4.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
             }
 
-            if (var6 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1) {
+            if (var6 == BlockPathTypes.OPEN && var4.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
-            } else {
+            else
                 return var7;
-            }
         }
     }
 
@@ -292,9 +279,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     protected BlockPathTypes getCachedBlockType(LivingEntity var0, int var1, int var2, int var3) {
-        return (BlockPathTypes) this.pathTypesByPosCache.computeIfAbsent(BlockPos.asLong(var1, var2, var3), (var4) -> {
-            return this.getBlockPathType(this.level, var1, var2, var3, var0);
-        });
+        return (BlockPathTypes) this.pathTypesByPosCache.computeIfAbsent(BlockPos.asLong(var1, var2, var3),
+                var4 -> this.getBlockPathType(this.level, var1, var2, var3, var0));
     }
 
     protected double getFloorLevel(BlockPos var0) {
@@ -418,9 +404,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (this.canStartAt(var1.set(var4.minX, var0, var4.minZ))
                     || this.canStartAt(var1.set(var4.minX, var0, var4.maxZ))
                     || this.canStartAt(var1.set(var4.maxX, var0, var4.minZ))
-                    || this.canStartAt(var1.set(var4.maxX, var0, var4.maxZ))) {
+                    || this.canStartAt(var1.set(var4.maxX, var0, var4.maxZ)))
                 return this.getStartNode(var1);
-            }
         }
 
         return this.getStartNode(new BlockPos(var3.getX(), var0, var3.getZ()));
@@ -434,9 +419,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     private boolean hasCollisions(AABB var0) {
-        return this.collisionCache.computeIfAbsent(var0, (var1) -> {
-            return !this.level.noCollision(this.mob, var0);
-        });
+        return this.collisionCache.computeIfAbsent(var0, var1 -> !this.level.noCollision(this.mob, var0));
     }
 
     protected boolean isAmphibious() {
@@ -444,25 +427,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     protected boolean isDiagonalValid(Node var0, Node var1, Node var2, Node var3) {
-        if (var3 != null && var2 != null && var1 != null) {
-            if (var3.closed) {
-                return false;
-            } else if (var2.y <= var0.y && var1.y <= var0.y) {
-                if (var1.type != BlockPathTypes.WALKABLE_DOOR && var2.type != BlockPathTypes.WALKABLE_DOOR
-                        && var3.type != BlockPathTypes.WALKABLE_DOOR) {
-                    boolean var4 = var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
-                            && this.mob.getBbWidth() < 0.5;
-                    return var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
-                            && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        } else {
+        if (((var3 == null) || (var2 == null) || (var1 == null)) || var3.closed)
+            return false;
+        else if (var2.y <= var0.y && var1.y <= var0.y) {
+            if (var1.type != BlockPathTypes.WALKABLE_DOOR && var2.type != BlockPathTypes.WALKABLE_DOOR
+                    && var3.type != BlockPathTypes.WALKABLE_DOOR) {
+                boolean var4 = var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
+                        && this.mob.getBbWidth() < 0.5;
+                return var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
+                        && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
+            } else
+                return false;
+        } else
             return false;
-        }
     }
 
     protected boolean isNeighborValid(Node var0, Node var1) {
@@ -493,17 +470,14 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     if (var6 != 0 || var8 != 0) {
                         var1.set(var3 + var6, var4 + var7, var5 + var8);
                         BlockState var9 = var0.getBlockState(var1);
-                        if (var9.is(Blocks.CACTUS) || var9.is(Blocks.SWEET_BERRY_BUSH)) {
+                        if (var9.is(Blocks.CACTUS) || var9.is(Blocks.SWEET_BERRY_BUSH))
                             return BlockPathTypes.DANGER_OTHER;
-                        }
 
-                        if (isBurningBlock(var9)) {
+                        if (isBurningBlock(var9))
                             return BlockPathTypes.DANGER_FIRE;
-                        }
 
-                        if (var0.getFluidState(var1).is(FluidTags.WATER)) {
+                        if (var0.getFluidState(var1).is(FluidTags.WATER))
                             return BlockPathTypes.WATER_BORDER;
-                        }
                     }
                 }
             }
@@ -521,48 +495,45 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         BlockState var2 = var0.getBlockState(var1);
         Block var3 = var2.getBlock();
         Material var4 = var2.getMaterial();
-        if (var2.isAir()) {
+        if (var2.isAir())
             return BlockPathTypes.OPEN;
-        } else if (!var2.is(BlockTags.TRAPDOORS) && !var2.is(Blocks.LILY_PAD) && !var2.is(Blocks.BIG_DRIPLEAF)) {
-            if (var2.is(Blocks.POWDER_SNOW)) {
+        else if (!var2.is(BlockTags.TRAPDOORS) && !var2.is(Blocks.LILY_PAD) && !var2.is(Blocks.BIG_DRIPLEAF)) {
+            if (var2.is(Blocks.POWDER_SNOW))
                 return BlockPathTypes.POWDER_SNOW;
-            } else if (!var2.is(Blocks.CACTUS) && !var2.is(Blocks.SWEET_BERRY_BUSH)) {
-                if (var2.is(Blocks.HONEY_BLOCK)) {
+            else if (!var2.is(Blocks.CACTUS) && !var2.is(Blocks.SWEET_BERRY_BUSH)) {
+                if (var2.is(Blocks.HONEY_BLOCK))
                     return BlockPathTypes.STICKY_HONEY;
-                } else if (var2.is(Blocks.COCOA)) {
+                else if (var2.is(Blocks.COCOA))
                     return BlockPathTypes.COCOA;
-                } else {
+                else {
                     FluidState var5 = var0.getFluidState(var1);
-                    if (var5.is(FluidTags.LAVA)) {
+                    if (var5.is(FluidTags.LAVA))
                         return BlockPathTypes.LAVA;
-                    } else if (isBurningBlock(var2)) {
+                    else if (isBurningBlock(var2))
                         return BlockPathTypes.DAMAGE_FIRE;
-                    } else if (DoorBlock.isWoodenDoor(var2) && !(Boolean) var2.getValue(DoorBlock.OPEN)) {
+                    else if (DoorBlock.isWoodenDoor(var2) && !(Boolean) var2.getValue(DoorBlock.OPEN))
                         return BlockPathTypes.DOOR_WOOD_CLOSED;
-                    } else if (var3 instanceof DoorBlock && var4 == Material.METAL
-                            && !(Boolean) var2.getValue(DoorBlock.OPEN)) {
+                    else if (var3 instanceof DoorBlock && var4 == Material.METAL
+                            && !(Boolean) var2.getValue(DoorBlock.OPEN))
                         return BlockPathTypes.DOOR_IRON_CLOSED;
-                    } else if (var3 instanceof DoorBlock && var2.getValue(DoorBlock.OPEN)) {
+                    else if (var3 instanceof DoorBlock && var2.getValue(DoorBlock.OPEN))
                         return BlockPathTypes.DOOR_OPEN;
-                    } else if (var3 instanceof BaseRailBlock) {
+                    else if (var3 instanceof BaseRailBlock)
                         return BlockPathTypes.RAIL;
-                    } else if (var3 instanceof LeavesBlock) {
+                    else if (var3 instanceof LeavesBlock)
                         return BlockPathTypes.LEAVES;
-                    } else if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS)
-                            || var3 instanceof FenceGateBlock && !(Boolean) var2.getValue(FenceGateBlock.OPEN)) {
+                    else if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS)
+                            || var3 instanceof FenceGateBlock && !(Boolean) var2.getValue(FenceGateBlock.OPEN))
                         return BlockPathTypes.FENCE;
-                    } else if (!var2.isPathfindable(var0, var1, PathComputationType.LAND)) {
+                    else if (!var2.isPathfindable(var0, var1, PathComputationType.LAND))
                         return BlockPathTypes.BLOCKED;
-                    } else {
+                    else
                         return var5.is(FluidTags.WATER) ? BlockPathTypes.WATER : BlockPathTypes.OPEN;
-                    }
                 }
-            } else {
+            } else
                 return BlockPathTypes.DAMAGE_OTHER;
-            }
-        } else {
+        } else
             return BlockPathTypes.TRAPDOOR;
-        }
     }
 
     public static BlockPathTypes getBlockPathTypeStatic(BlockGetter var0, BlockPos.MutableBlockPos var1) {
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluatorBase.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluatorBase.java
index 8a2c87ae1..8b30e395a 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluatorBase.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/EntityNodeEvaluatorBase.java
@@ -21,7 +21,7 @@ public abstract class EntityNodeEvaluatorBase extends NodeEvaluator {
     protected PathNavigationRegion level;
     protected LivingEntity mob;
     protected MobAI mvmt;
-    protected final Int2ObjectMap<Node> nodes = new Int2ObjectOpenHashMap<Node>();
+    protected final Int2ObjectMap<Node> nodes = new Int2ObjectOpenHashMap<>();
 
     @Override
     public boolean canFloat() {
@@ -57,9 +57,7 @@ public abstract class EntityNodeEvaluatorBase extends NodeEvaluator {
 
     @Override
     protected Node getNode(int var0, int var1, int var2) {
-        return this.nodes.computeIfAbsent(Node.createHash(var0, var1, var2), (var3) -> {
-            return new Node(var0, var1, var2);
-        });
+        return this.nodes.computeIfAbsent(Node.createHash(var0, var1, var2), var3 -> new Node(var0, var1, var2));
     }
 
     @Override
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 3287164c1..d46b2bb22 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
@@ -81,10 +81,12 @@ public class EntityPathfinder extends PathFinder {
                     var9.add(target);
                 }
             }
-            if (!var9.isEmpty())
+            if (!var9.isEmpty()) {
                 break;
-            if (node.distanceTo(var1) >= var3)
+            }
+            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];
@@ -125,12 +127,9 @@ public class EntityPathfinder extends PathFinder {
     }
 
     public Stream<Path> getFallbackDestinations(Map<Target, BlockPos> var1, Set<Target> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
+        return var5.stream().map(var1x -> this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
     }
 
     private Path reconstructPath(Node var0, BlockPos var1, boolean var2) {
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 1f065257a..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
@@ -168,9 +168,8 @@ public interface MobAI {
                     mob.getJumpControl().tick();
                 }
             };
-        } else if (handle instanceof 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 11070c979..3df155983 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
@@ -562,9 +562,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().getSessionService();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -605,9 +604,8 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -634,9 +632,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         MobAI ai = MobAI.from(handle);
         MoveControl controller = ai != null ? ai.getMoveControl() : null;
-        if (controller == null || !controller.hasWanted()) {
+        if (controller == null || !controller.hasWanted())
             return null;
-        }
         return new Location(entity.getWorld(), controller.getWantedX(), controller.getWantedY(),
                 controller.getWantedZ());
     }
@@ -648,9 +645,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof org.bukkit.entity.LivingEntity)) {
+        if (!(entity instanceof org.bukkit.entity.LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((org.bukkit.entity.LivingEntity) entity).getYHeadRot();
     }
 
@@ -711,7 +707,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -723,9 +719,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_META_PROFILE == null) {
             SKULL_META_PROFILE = NMS.getFirstGetter(meta.getClass(), GameProfile.class);
-            if (SKULL_META_PROFILE == null) {
+            if (SKULL_META_PROFILE == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_META_PROFILE.invoke(meta);
@@ -758,8 +753,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof org.bukkit.entity.LivingEntity))
             return DEFAULT_SPEED;
         LivingEntity handle = getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttribute(Attributes.d).getValue();
@@ -773,22 +768,16 @@ public class NMSImpl implements NMSBridge {
     @Override
     public MCNavigator getTargetNavigator(org.bukkit.entity.Entity entity, Iterable<Vector> nodes,
             final NavigatorParameters params) {
-        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(nodes, (input) -> {
-            return new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ());
-        }));
+        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(nodes, input -> new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ())));
         Node last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final Path path = new Path(list, last != null ? new BlockPos(last.x, last.y, last.z) : null, true);
-        return getTargetNavigator(entity, params, input -> {
-            return input.moveTo(path, params.speed());
-        });
+        return getTargetNavigator(entity, params, input -> input.moveTo(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, input -> {
-            return input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-        });
+        return getTargetNavigator(entity, params, input -> input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -894,11 +883,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -1122,7 +1110,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1134,8 +1122,9 @@ public class NMSImpl implements NMSBridge {
             double pitch = distanceY == 0 ? 0
                     : Math.toDegrees(Math.acos(yDiff / distanceY))
                             - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            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 {
@@ -1166,7 +1155,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = getHandle(from), target = getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             if (to instanceof org.bukkit.entity.LivingEntity) {
                 look(from, ((org.bukkit.entity.LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1201,8 +1190,9 @@ public class NMSImpl implements NMSBridge {
         GameProfile playerProfile = null;
         for (int i = 0; i < list.size(); i++) {
             ClientboundPlayerInfoUpdatePacket.Entry npcInfo = list.get(i);
-            if (npcInfo == null)
+            if (npcInfo == null) {
                 continue;
+            }
 
             MirrorTrait trait = mirrorTraits.apply(npcInfo.profileId());
             if (trait == null || !trait.isMirroring(player)) {
@@ -1232,8 +1222,9 @@ public class NMSImpl implements NMSBridge {
             }
 
             Collection<Property> textures = playerProfile.getProperties().get("textures");
-            if (textures == null || textures.size() == 0)
+            if (textures == null || textures.size() == 0) {
                 continue;
+            }
 
             npcInfo.profile().getProperties().clear();
             for (String key : playerProfile.getProperties().keySet()) {
@@ -1321,8 +1312,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             net.minecraft.world.entity.EntityType<?> type = ENTITY_REGISTRY.findType(search);
             ResourceLocation key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1621,9 +1613,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SET_PROFILE_METHOD == null) {
             SET_PROFILE_METHOD = NMS.getMethodHandle(meta.getClass(), "setProfile", true, GameProfile.class);
-            if (SET_PROFILE_METHOD == null) {
+            if (SET_PROFILE_METHOD == null)
                 return;
-            }
         }
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
@@ -1953,9 +1944,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.moveTo(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -2044,9 +2034,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -2055,25 +2044,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.nbt.Tag base) {
-        if (base instanceof net.minecraft.nbt.IntTag) {
+        if (base instanceof net.minecraft.nbt.IntTag)
             return new IntTag(key, ((net.minecraft.nbt.IntTag) base).getAsInt());
-        } else if (base instanceof net.minecraft.nbt.FloatTag) {
+        else if (base instanceof net.minecraft.nbt.FloatTag)
             return new FloatTag(key, ((net.minecraft.nbt.FloatTag) base).getAsFloat());
-        } else if (base instanceof net.minecraft.nbt.DoubleTag) {
+        else if (base instanceof net.minecraft.nbt.DoubleTag)
             return new DoubleTag(key, ((net.minecraft.nbt.DoubleTag) base).getAsDouble());
-        } else if (base instanceof net.minecraft.nbt.LongTag) {
+        else if (base instanceof net.minecraft.nbt.LongTag)
             return new LongTag(key, ((net.minecraft.nbt.LongTag) base).getAsLong());
-        } else if (base instanceof net.minecraft.nbt.ShortTag) {
+        else if (base instanceof net.minecraft.nbt.ShortTag)
             return new ShortTag(key, ((net.minecraft.nbt.ShortTag) base).getAsShort());
-        } else if (base instanceof net.minecraft.nbt.ByteTag) {
+        else if (base instanceof net.minecraft.nbt.ByteTag)
             return new ByteTag(key, ((net.minecraft.nbt.ByteTag) base).getAsByte());
-        } else if (base instanceof net.minecraft.nbt.ByteArrayTag) {
+        else if (base instanceof net.minecraft.nbt.ByteArrayTag)
             return new ByteArrayTag(key, ((net.minecraft.nbt.ByteArrayTag) base).getAsByteArray());
-        } else if (base instanceof net.minecraft.nbt.IntArrayTag) {
+        else if (base instanceof net.minecraft.nbt.IntArrayTag)
             return new IntArrayTag(key, ((net.minecraft.nbt.IntArrayTag) base).getAsIntArray());
-        } else if (base instanceof net.minecraft.nbt.StringTag) {
+        else if (base instanceof net.minecraft.nbt.StringTag)
             return new StringTag(key, base.getAsString());
-        } else if (base instanceof net.minecraft.nbt.ListTag) {
+        else if (base instanceof net.minecraft.nbt.ListTag) {
             List<net.minecraft.nbt.Tag> list = (List<net.minecraft.nbt.Tag>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -2083,19 +2072,17 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } else if (base instanceof net.minecraft.nbt.CompoundTag) {
-            return convertNBT(((net.minecraft.nbt.CompoundTag) base));
-        } else if (base instanceof net.minecraft.nbt.EndTag) {
+        } else if (base instanceof net.minecraft.nbt.CompoundTag)
+            return convertNBT((net.minecraft.nbt.CompoundTag) base);
+        else if (base instanceof net.minecraft.nbt.EndTag)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) {
         if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) {
             double d0 = 0.08D;
-            boolean flag = ((entity.getDeltaMovement()).y <= 0.0D);
+            boolean flag = entity.getDeltaMovement().y <= 0.0D;
             if (flag && entity.hasEffect(MobEffects.SLOW_FALLING)) {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
@@ -2106,27 +2093,32 @@ public class NMSImpl implements NMSBridge {
                 float f = entity.isSprinting() ? 0.9F : 0.8F;
                 float f1 = 0.02F;
                 float f2 = EnchantmentHelper.getDepthStrider(entity);
-                if (f2 > 3.0F)
+                if (f2 > 3.0F) {
                     f2 = 3.0F;
-                if (!entity.isOnGround())
+                }
+                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))
+                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())
+                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);
                 if (entity.horizontalCollision
-                        && entity.isFree(vec3d2.x, vec3d2.y + 0.6D - entity.getY() + d1, vec3d2.z))
+                        && 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);
@@ -2138,16 +2130,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-                if (!entity.isNoGravity())
+                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.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)
+                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);
@@ -2164,9 +2159,10 @@ public class NMSImpl implements NMSBridge {
                     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)
+                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) {
@@ -2179,13 +2175,14 @@ public class NMSImpl implements NMSBridge {
                     }
                 }
                 if (entity.isOnGround() && !entity.level.isClientSide && entity.getSharedFlag(7)
-                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
+                }
             } else {
-                BlockPos blockposition = BlockPos.containing(entity.getX(), (entity.getBoundingBox()).minY - 0.5D,
+                BlockPos blockposition = BlockPos.containing(entity.getX(), entity.getBoundingBox().minY - 0.5D,
                         entity.getZ());
                 float f5 = entity.level.getBlockState(blockposition).getBlock().getFriction();
-                float f = entity.isOnGround() ? (f5 * 0.91F) : 0.91F;
+                float f = entity.isOnGround() ? f5 * 0.91F : 0.91F;
                 Vec3 vec3d6 = entity.handleRelativeFrictionAndCalculateMovement(vec3d, f5);
                 double d7 = vec3d6.y;
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -2333,11 +2330,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, Mob handle, Vec3 vec3d) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
-            handle.moveRelative((handle instanceof Dolphin || handle instanceof Axolotl) ? handle.getSpeed()
+            handle.moveRelative(handle instanceof Dolphin || handle instanceof Axolotl ? handle.getSpeed()
                     : handle instanceof Turtle ? 0.1F : 0.01F, vec3d);
             handle.move(MoverType.SELF, handle.getDeltaMovement());
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
@@ -2387,7 +2383,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2396,8 +2392,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
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 7580af54f..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
@@ -73,17 +73,15 @@ public class AllayController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -166,7 +164,7 @@ public class AllayController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -199,11 +197,10 @@ public class AllayController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -247,9 +244,8 @@ public class AllayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 85c4aaf9a..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
@@ -82,9 +82,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -143,9 +142,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 82d2f2f7a..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
@@ -80,17 +80,15 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +162,7 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,9 +173,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         protected Brain<?> makeBrain(Dynamic<?> dynamic) {
-            if (npc == null || npc.useMinecraftAI()) {
+            if (npc == null || npc.useMinecraftAI())
                 return super.makeBrain(dynamic);
-            }
             return brainProvider().makeBrain(dynamic);
         }
 
@@ -186,19 +183,17 @@ public class AxolotlController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET) {
+            if (itemstack.getItem() == Items.BUCKET || itemstack.getItem() == Items.WATER_BUCKET)
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -214,8 +209,9 @@ public class AxolotlController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -258,9 +254,8 @@ public class AxolotlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4836c876b..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
@@ -63,9 +63,8 @@ public class BatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -145,7 +144,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -186,9 +185,8 @@ public class BatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 915f2bf36..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
@@ -60,9 +60,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -142,7 +141,7 @@ public class BeeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -183,9 +182,8 @@ public class BeeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 091a46472..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
@@ -60,9 +60,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -137,7 +136,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -178,9 +177,8 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a1e6d1de9..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
@@ -65,6 +65,7 @@ public class CamelController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityCamelNPC(EntityType<? extends Camel> types, Level level) {
             this(types, level, null);
         }
@@ -81,17 +82,15 @@ public class CamelController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -178,9 +177,8 @@ public class CamelController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -202,7 +200,7 @@ public class CamelController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -213,11 +211,10 @@ public class CamelController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -270,9 +267,8 @@ public class CamelController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 961ac4286..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
@@ -63,17 +63,15 @@ public class CatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class CatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class CatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e50c07a60..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
@@ -62,17 +62,15 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2c2e8e650..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
@@ -71,17 +71,15 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +162,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,11 +173,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 53b87bcd6..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
@@ -87,17 +87,15 @@ public class CodController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -191,7 +189,7 @@ public class CodController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -205,19 +203,17 @@ public class CodController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -263,9 +259,8 @@ public class CodController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 796cee22c..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
@@ -68,17 +68,15 @@ public class CowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -161,7 +159,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,19 +173,17 @@ public class CowController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -240,9 +236,8 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 21b9293c0..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
@@ -53,6 +53,7 @@ public class CreeperController extends MobEntityController {
         private boolean allowPowered;
 
         private final CitizensNPC npc;
+
         public EntityCreeperNPC(EntityType<? extends Creeper> types, Level level) {
             this(types, level, null);
         }
@@ -64,17 +65,15 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -164,7 +163,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -175,11 +174,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -195,8 +193,9 @@ public class CreeperController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -242,9 +241,8 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 970156e80..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
@@ -74,17 +74,15 @@ public class DolphinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -163,7 +161,7 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -174,11 +172,10 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -243,9 +240,8 @@ public class DolphinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6e0611523..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
@@ -62,17 +62,15 @@ public class DrownedController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -186,8 +183,9 @@ public class DrownedController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -213,9 +211,8 @@ public class DrownedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 863f1b58e..b9092537d 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
@@ -149,9 +149,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -218,7 +217,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -240,8 +239,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -271,9 +271,8 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2f41d8673..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
@@ -65,17 +65,15 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -158,7 +156,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,11 +167,10 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -189,16 +186,16 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
         public Optional<Boolean> randomTeleport(double d0, double d1, double d2, boolean flag,
                 PlayerTeleportEvent.TeleportCause cause) {
-            if (npc == null) {
+            if (npc == null)
                 return super.randomTeleport(d0, d1, d2, flag, cause);
-            }
             return Optional.of(false);
         }
 
@@ -234,9 +231,8 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d5de6c584..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
@@ -62,17 +62,15 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -186,8 +183,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -222,9 +220,8 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4fbf07393..e7e9a7c83 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
@@ -85,9 +85,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.causeFallDamage(f, f1, damagesource);
-        }
         return false;
     }
 
@@ -217,9 +216,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public Component getTabListDisplayName() {
-        if (Setting.DISABLE_TABLIST.asBoolean()) {
+        if (Setting.DISABLE_TABLIST.asBoolean())
             return MutableComponent.create(new LiteralContents(""));
-        }
         return super.getTabListDisplayName();
     }
 
@@ -268,7 +266,7 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public void knockback(double strength, double dx, double dz) {
-        NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+        NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                 evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
     }
 
@@ -302,11 +300,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean onClimbable() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.onClimbable();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -407,9 +404,8 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
 
         @Override
         public boolean canSee(org.bukkit.entity.Entity entity) {
-            if (entity != null && entity.getType().name().contains("ITEM_FRAME")) {
+            if (entity != null && entity.getType().name().contains("ITEM_FRAME"))
                 return false; // optimise for large maps in item frames
-            }
             return super.canSee(entity);
         }
 
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 ca9a5fa98..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
@@ -56,17 +56,15 @@ public class EvokerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -208,9 +205,8 @@ public class EvokerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8c618c461..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
@@ -57,17 +57,15 @@ public class FoxController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class FoxController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class FoxController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1e63e74a6..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
@@ -60,17 +60,15 @@ public class FrogController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class FrogController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,11 +162,10 @@ public class FrogController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -221,9 +218,8 @@ public class FrogController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8ceda28d7..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
@@ -54,9 +54,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -137,7 +136,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -178,9 +177,8 @@ public class GhastController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8a836d635..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
@@ -56,17 +56,15 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6a55537d9..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
@@ -56,17 +56,15 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class GlowSquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class GlowSquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 559833eed..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
@@ -57,17 +57,15 @@ public class GoatController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class GoatController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class GoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9cedad6de..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
@@ -71,17 +71,15 @@ public class GuardianController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2af2d2fe6..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
@@ -71,17 +71,15 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class GuardianElderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9ad3cb94a..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
@@ -59,17 +59,15 @@ public class HoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -186,8 +183,9 @@ public class HoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -213,9 +211,8 @@ public class HoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 cf6d3d412..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
@@ -76,17 +76,15 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -173,9 +171,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 994b8d43d..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
@@ -76,17 +76,15 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -173,9 +171,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseDonkeyController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b5554647b..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
@@ -59,6 +59,7 @@ public class HorseMuleController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityHorseMuleNPC(EntityType<? extends Mule> types, Level level) {
             this(types, level, null);
         }
@@ -75,17 +76,15 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -172,9 +171,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +194,7 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +205,10 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -264,9 +261,8 @@ public class HorseMuleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ee425be1a..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
@@ -58,6 +58,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseSkeletonNPC(EntityType<? extends SkeletonHorse> types, Level level) {
             this(types, level, null);
         }
@@ -74,17 +75,15 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -171,9 +170,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -195,7 +193,7 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -206,11 +204,10 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -263,9 +260,8 @@ public class HorseSkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 aa065c65d..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
@@ -76,17 +76,15 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -173,9 +171,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -197,7 +194,7 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,11 +205,10 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -265,9 +261,8 @@ public class HorseZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 640a5f7e0..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
@@ -24,7 +24,6 @@ import net.minecraft.server.level.ServerLevel;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
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 49f1fb5f1..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
@@ -56,17 +56,15 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -208,9 +205,8 @@ public class IllusionerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 48a2db674..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
@@ -56,17 +56,15 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 034da36e9..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
@@ -59,6 +59,7 @@ public class LlamaController extends MobEntityController {
         private final CitizensNPC npc;
 
         private boolean riding;
+
         public EntityLlamaNPC(EntityType<? extends Llama> types, Level level) {
             this(types, level, null);
         }
@@ -75,17 +76,15 @@ public class LlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -172,9 +171,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean isControlledByLocalInstance() {
-            if (npc != null && riding) {
+            if (npc != null && riding)
                 return true;
-            }
             return super.isControlledByLocalInstance();
         }
 
@@ -196,7 +194,7 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -207,11 +205,10 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -264,9 +261,8 @@ public class LlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1be20deca..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
@@ -66,17 +66,15 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -188,8 +185,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -239,9 +237,8 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 113b14bea..aea5057c7 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
@@ -78,5 +78,5 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
 }
\ No newline at end of file
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 f7f98f429..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
@@ -60,17 +60,15 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -171,11 +169,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -200,8 +197,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -227,9 +225,8 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8c5c221bd..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
@@ -58,17 +58,15 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -156,7 +154,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -167,11 +165,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -224,9 +221,8 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 18634bda0..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
@@ -57,17 +57,15 @@ public class PandaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class PandaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class PandaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1635e45e2..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
@@ -57,9 +57,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -139,7 +138,7 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -151,9 +150,8 @@ public class ParrotController extends MobEntityController {
         @Override
         public InteractionResult mobInteract(Player entityhuman, InteractionHand enumhand) {
             // block feeding
-            if (npc == null || !npc.isProtected()) {
+            if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
-            }
             return InteractionResult.FAIL;
         }
 
@@ -189,9 +187,8 @@ public class ParrotController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b504a9434..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
@@ -91,17 +91,15 @@ public class PhantomController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -182,7 +180,7 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -193,11 +191,10 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -222,8 +219,9 @@ public class PhantomController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -254,9 +252,8 @@ public class PhantomController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3e4fb880f..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
@@ -58,17 +58,15 @@ public class PigController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 8a4ff4b1b..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
@@ -56,17 +56,15 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 78a092d26..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
@@ -56,17 +56,15 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class PiglinBruteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -210,9 +208,8 @@ public class PiglinBruteController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 56021256d..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
@@ -56,17 +56,15 @@ public class PiglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -183,8 +180,9 @@ public class PiglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -210,9 +208,8 @@ public class PiglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e8feadc19..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
@@ -57,17 +57,15 @@ public class PillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class PillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 784992a32..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
@@ -55,9 +55,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -133,7 +132,7 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -183,9 +182,8 @@ public class PolarBearController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d6648bdc8..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
@@ -87,17 +87,15 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,9 +148,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public EntityDimensions getDimensions(Pose entitypose) {
-            if (npc == null) {
+            if (npc == null)
                 return super.getDimensions(entitypose);
-            }
             return super.getDimensions(entitypose).scale(1 / s(getPuffState())).scale(0.5F);
         }
 
@@ -194,7 +191,7 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -208,19 +205,17 @@ public class PufferFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -278,9 +273,8 @@ public class PufferFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b3b5f8561..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
@@ -58,17 +58,15 @@ public class RabbitController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -159,7 +157,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -170,11 +168,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -238,9 +235,8 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 1cc6d1dd0..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
@@ -57,17 +57,15 @@ public class RavagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,12 +148,12 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean isVehicle() {
-            return (npc == null || npc.useMinecraftAI()) ? super.isVehicle() : false;
+            return npc == null || npc.useMinecraftAI() ? super.isVehicle() : false;
         }
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,11 +164,10 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -223,9 +220,8 @@ public class RavagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5e562f127..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
@@ -81,17 +81,15 @@ public class SalmonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -183,7 +181,7 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -197,19 +195,17 @@ public class SalmonController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,8 +221,9 @@ public class SalmonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class SalmonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4e8eab2d0..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
@@ -57,17 +57,15 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -190,8 +187,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -217,9 +215,8 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f04bbd7b9..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
@@ -64,17 +64,15 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -153,7 +151,7 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -164,11 +162,10 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -184,8 +181,9 @@ public class ShulkerController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -233,9 +231,8 @@ public class ShulkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 727594be3..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
@@ -56,17 +56,15 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a08970d0e..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
@@ -56,17 +56,15 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c1c38b022..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
@@ -56,17 +56,15 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SkeletonStrayController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SkeletonStrayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 71adfe089..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
@@ -56,17 +56,15 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SkeletonWitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SkeletonWitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 641800e77..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
@@ -49,6 +49,7 @@ public class SlimeController extends MobEntityController {
         private final CitizensNPC npc;
 
         private MoveControl oldMoveController;
+
         public EntitySlimeNPC(EntityType<? extends Slime> types, Level level) {
             this(types, level, null);
         }
@@ -149,7 +150,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +161,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -239,9 +239,8 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 6d1dcaa5d..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
@@ -62,17 +62,15 @@ public class SnifferController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -155,7 +153,7 @@ public class SnifferController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,19 +167,17 @@ public class SnifferController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby()) {
+            if (itemstack.getItem() == Items.BUCKET && !entityhuman.getAbilities().instabuild && !this.isBaby())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -234,9 +230,8 @@ public class SnifferController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 46b05a427..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
@@ -56,17 +56,15 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 4edb1de3b..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
@@ -56,17 +56,15 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b3d950150..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
@@ -56,17 +56,15 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e475c1800..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
@@ -56,17 +56,15 @@ public class StriderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class StriderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class StriderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class StriderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 32a04df2c..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
@@ -82,17 +82,15 @@ public class TadpoleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -183,7 +181,7 @@ public class TadpoleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -197,19 +195,17 @@ public class TadpoleController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if ((Frog.TEMPTATION_ITEM.test(itemstack) || itemstack.getItem() == Items.WATER_BUCKET) && isAlive()) {
+            if ((Frog.TEMPTATION_ITEM.test(itemstack) || itemstack.getItem() == Items.WATER_BUCKET) && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,8 +221,9 @@ public class TadpoleController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -254,9 +251,8 @@ public class TadpoleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 84f1f0c7f..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
@@ -69,17 +69,15 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -168,7 +166,7 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -179,11 +177,10 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -236,9 +233,8 @@ public class TraderLlamaController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 aa79fa7aa..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
@@ -81,17 +81,15 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -185,7 +183,7 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -199,19 +197,17 @@ public class TropicalFishController extends MobEntityController {
             if (npc == null || !npc.isProtected())
                 return super.mobInteract(entityhuman, enumhand);
             ItemStack itemstack = entityhuman.getItemInHand(enumhand);
-            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive()) {
+            if (itemstack.getItem() == Items.WATER_BUCKET && isAlive())
                 return InteractionResult.FAIL;
-            }
             return super.mobInteract(entityhuman, enumhand);
         }
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -227,8 +223,9 @@ public class TropicalFishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -256,9 +253,8 @@ public class TropicalFishController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 16ef7d271..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
@@ -70,17 +70,15 @@ public class TurtleController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -171,7 +169,7 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -182,11 +180,10 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -232,9 +229,8 @@ public class TurtleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a001b2604..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
@@ -57,9 +57,8 @@ public class VexController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -135,7 +134,7 @@ public class VexController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -176,9 +175,8 @@ public class VexController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3c81e11b0..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
@@ -68,17 +68,15 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -175,7 +173,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,11 +196,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -262,9 +259,8 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9984206cb..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
@@ -57,17 +57,15 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -150,7 +148,7 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -161,11 +159,10 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -218,9 +215,8 @@ public class VindicatorController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 7aae31b27..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
@@ -66,17 +66,15 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -175,7 +173,7 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -198,11 +196,10 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -266,9 +263,8 @@ public class WanderingTraderController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 21c53fdd6..4aa752696 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
@@ -59,17 +59,15 @@ public class WardenController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -157,7 +155,7 @@ public class WardenController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -168,11 +166,10 @@ public class WardenController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -216,9 +213,8 @@ public class WardenController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 312ed916a..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
@@ -56,17 +56,15 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -216,9 +214,8 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 3a5d5fe4b..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
@@ -54,9 +54,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
@@ -147,7 +146,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -169,8 +168,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -187,9 +187,8 @@ public class WitherController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 16eaa10ed..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
@@ -59,17 +59,15 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -152,7 +150,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -163,11 +161,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -225,9 +222,8 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 aef8876d1..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
@@ -56,17 +56,15 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -151,7 +149,7 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -162,11 +160,10 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -182,8 +179,9 @@ public class ZoglinController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -209,9 +207,8 @@ public class ZoglinController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 724f084b4..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
@@ -56,17 +56,15 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f02e9f2ae..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
@@ -56,17 +56,15 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -180,8 +177,9 @@ public class ZombieHuskController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.push(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -207,9 +205,8 @@ public class ZombieHuskController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ccfdcbf42..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
@@ -56,17 +56,15 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         protected boolean canRide(Entity entity) {
-            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
+            if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart))
                 return !npc.isProtected();
-            }
             return super.canRide(entity);
         }
 
         @Override
         public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.causeFallDamage(f, f1, damagesource);
-            }
             return false;
         }
 
@@ -149,7 +147,7 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public void knockback(double strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, (evt) -> super.knockback((float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, (float) strength, dx, dz, evt -> super.knockback((float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -160,11 +158,10 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean onClimbable() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.onClimbable();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
@@ -208,9 +205,8 @@ public class ZombieVillagerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 25b3e4d42..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
@@ -124,9 +124,8 @@ public class AreaEffectCloudController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 68431274f..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
@@ -137,9 +137,8 @@ public class BlockDisplayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5876f332a..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
@@ -88,7 +88,7 @@ public class BoatController extends MobEntityController {
         private Status getStatus() {
             Status entityboat_Status = u();
             if (entityboat_Status != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
             if (t())
@@ -164,7 +164,7 @@ public class BoatController extends MobEntityController {
                         if (fluid.is(FluidTags.WATER)) {
                             float f = l1 + fluid.getHeight(this.level(), blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -190,7 +190,7 @@ public class BoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == Status.IN_AIR && this.aE != Status.IN_AIR && this.aE != Status.ON_LAND) {
                     this.aC = getY(1.0D);
-                    setPos(getX(), (getWaterLevelAbove() - getBbHeight()) + 0.101D, getZ());
+                    setPos(getX(), getWaterLevelAbove() - getBbHeight() + 0.101D, getZ());
                     setDeltaMovement(getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                     this.aE = Status.IN_WATER;
                 } else {
@@ -216,7 +216,7 @@ public class BoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3 vec3d1 = getDeltaMovement();
-                        setDeltaMovement(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(MoverType.SELF, getDeltaMovement());
@@ -244,8 +244,8 @@ public class BoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.set(k1, l1, i2);
                         FluidState fluid = this.level().getFluidState(blockposition_mutableblockposition);
-                        if (fluid.is(FluidTags.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.level(), blockposition_mutableblockposition))) {
+                        if (fluid.is(FluidTags.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.level(), blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
@@ -258,9 +258,8 @@ public class BoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 46261b87f..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
@@ -89,7 +89,7 @@ public class ChestBoatController extends MobEntityController {
         private Status getStatus() {
             Status entityboat_Status = u();
             if (entityboat_Status != null) {
-                this.aC = (getBoundingBox()).maxY;
+                this.aC = getBoundingBox().maxY;
                 return entityboat_Status;
             }
             if (t())
@@ -165,7 +165,7 @@ public class ChestBoatController extends MobEntityController {
                         if (fluid.is(FluidTags.WATER)) {
                             float f = l1 + fluid.getHeight(this.level(), blockposition_mutableblockposition);
                             this.aC = Math.max(f, this.aC);
-                            m = flag | ((axisalignedbb.minY < f) ? true : false);
+                            m = flag | (axisalignedbb.minY < f ? true : false);
                         }
                     }
                 }
@@ -191,7 +191,7 @@ public class ChestBoatController extends MobEntityController {
                 this.ap = 0.05F;
                 if (this.aF == Status.IN_AIR && this.aE != Status.IN_AIR && this.aE != Status.ON_LAND) {
                     this.aC = getY(1.0D);
-                    setPos(getX(), (getWaterLevelAbove() - getBbHeight()) + 0.101D, getZ());
+                    setPos(getX(), getWaterLevelAbove() - getBbHeight() + 0.101D, getZ());
                     setDeltaMovement(getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
                     this.aE = Status.IN_WATER;
                 } else {
@@ -217,7 +217,7 @@ public class ChestBoatController extends MobEntityController {
                     this.ar *= this.ap;
                     if (d2 > 0.0D) {
                         Vec3 vec3d1 = getDeltaMovement();
-                        setDeltaMovement(vec3d1.x, (vec3d1.y + d2 * 0.0615D), vec3d1.z);
+                        setDeltaMovement(vec3d1.x, vec3d1.y + d2 * 0.0615D, vec3d1.z);
                     }
                 }
                 move(MoverType.SELF, getDeltaMovement());
@@ -245,8 +245,8 @@ public class ChestBoatController extends MobEntityController {
                     for (int i2 = i1; i2 < j1; i2++) {
                         blockposition_mutableblockposition.set(k1, l1, i2);
                         FluidState fluid = this.level().getFluidState(blockposition_mutableblockposition);
-                        if (fluid.is(FluidTags.WATER) && d0 < (blockposition_mutableblockposition.getY()
-                                + fluid.getHeight(this.level(), blockposition_mutableblockposition))) {
+                        if (fluid.is(FluidTags.WATER) && d0 < blockposition_mutableblockposition.getY()
+                                + fluid.getHeight(this.level(), blockposition_mutableblockposition)) {
                             if (!fluid.isSource())
                                 return Status.UNDER_FLOWING_WATER;
                             flag = true;
@@ -259,9 +259,8 @@ public class ChestBoatController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 cc44b7713..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
@@ -136,9 +136,8 @@ public class DragonFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b43a91363..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
@@ -141,9 +141,8 @@ public class EggController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 d60d518e3..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
@@ -124,9 +124,8 @@ public class EnderCrystalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9e0772d47..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
@@ -128,9 +128,8 @@ public class EnderPearlController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 69d97e6e5..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
@@ -125,9 +125,8 @@ public class EnderSignalController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ce97bfa8f..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
@@ -72,9 +72,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public InteractionResult interactAt(Player entityhuman, Vec3 vec3d, InteractionHand enumhand) {
-            if (npc == null) {
+            if (npc == null)
                 return super.interactAt(entityhuman, vec3d, enumhand);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent(
                     (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
@@ -132,9 +131,8 @@ public class EvokerFangsController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2771b591e..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
@@ -118,9 +118,8 @@ public class ExperienceOrbController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b84a04eb3..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
@@ -149,9 +149,8 @@ public class FallingBlockController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 869ebd40a..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
@@ -119,9 +119,8 @@ public class FireworkController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 93334b646..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
@@ -76,9 +76,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public double distanceToSqr(Entity entity) {
-            if (entity == getPlayerOwner()) {
+            if (entity == getPlayerOwner())
                 return 0D;
-            }
             return super.distanceToSqr(entity);
         }
 
@@ -154,9 +153,8 @@ public class FishingHookController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 85ed28e86..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
@@ -135,9 +135,8 @@ public class GlowItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 0a036cf9a..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
@@ -118,9 +118,8 @@ public class InteractionController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9efc4688f..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
@@ -138,9 +138,8 @@ public class ItemController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 e8ee13f65..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
@@ -130,9 +130,8 @@ public class ItemDisplayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 eb3f3ae5c..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
@@ -134,9 +134,8 @@ public class ItemFrameController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 23d7575d8..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
@@ -130,9 +130,8 @@ public class LargeFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 22f2a1269..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
@@ -124,9 +124,8 @@ public class LeashController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 df3860599..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
@@ -138,9 +138,8 @@ public class LlamaSpitController extends AbstractEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 de684ce0a..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
@@ -118,9 +118,8 @@ public class MarkerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f8363341f..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
@@ -119,9 +119,8 @@ public class MinecartChestController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 2aa4ec765..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
@@ -119,9 +119,8 @@ public class MinecartCommandController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 66309eaaa..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
@@ -119,9 +119,8 @@ public class MinecartFurnaceController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 9b49aab0a..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
@@ -106,9 +106,8 @@ public class MinecartHopperController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 30ed83313..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
@@ -118,9 +118,8 @@ public class MinecartRideableController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 b6e692c9e..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
@@ -106,9 +106,8 @@ public class MinecartSpawnerController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 620248ace..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
@@ -106,9 +106,8 @@ public class MinecartTNTController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 41ea47094..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
@@ -123,9 +123,8 @@ public class PaintingController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 56183a4a8..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
@@ -118,9 +118,8 @@ public class ShulkerBulletController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 a2a638619..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
@@ -121,9 +121,8 @@ public class SmallFireballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 c188308b4..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
@@ -118,9 +118,8 @@ public class SnowballController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ebebc5ecf..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
@@ -119,9 +119,8 @@ public class SpectralArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 45039126f..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
@@ -119,9 +119,8 @@ public class TNTPrimedController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 50770397b..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
@@ -117,9 +117,8 @@ public class TextDisplayController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 f263556d6..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
@@ -122,9 +122,8 @@ public class ThrownExpBottleController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 5c2cd90b1..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
@@ -123,9 +123,8 @@ public class ThrownPotionController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 11459a0eb..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
@@ -119,9 +119,8 @@ public class ThrownTridentController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 ef3f0b74a..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
@@ -118,9 +118,8 @@ public class TippedArrowController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 948da24c6..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
@@ -118,9 +118,8 @@ public class WitherSkullController extends MobEntityController {
 
         @Override
         public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
-            if (npc == null) {
+            if (npc == null)
                 return super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
-            }
             Vec3 old = getDeltaMovement().add(0, 0, 0);
             boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
             if (!npc.isPushableByFluids()) {
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 201714f67..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
@@ -37,13 +37,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     protected float getStrength(BlockState block) {
         float base = block.getDestroySpeed(null, BlockPos.ZERO);
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(BlockState block) {
-        if (block.requiresCorrectToolForDrops()) {
+        if (block.requiresCorrectToolForDrops())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.isCorrectToolForDrops(block) : false;
         }
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CustomEntityRegistry.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CustomEntityRegistry.java
index df444fdb1..a911387cb 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CustomEntityRegistry.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/CustomEntityRegistry.java
@@ -224,9 +224,8 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
 
     @Override
     public EntityType get(ResourceLocation key) {
-        if (entities.containsKey(key)) {
+        if (entities.containsKey(key))
             return entities.get(key);
-        }
         return wrapped.get(key);
     }
 
@@ -242,17 +241,15 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
 
     @Override
     public int getId(EntityType key) {
-        if (entityIds.containsKey(key)) {
+        if (entityIds.containsKey(key))
             return entityIds.get(key);
-        }
         return wrapped.getId(key);
     }
 
     @Override
     public ResourceLocation getKey(EntityType value) {
-        if (entityClasses.containsKey(value)) {
+        if (entityClasses.containsKey(value))
             return entityClasses.get(value);
-        }
         return wrapped.getKey(value);
     }
 
@@ -263,9 +260,8 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry<EntityType<?>>
 
     @Override
     public Optional<EntityType<?>> getOptional(ResourceLocation var0) {
-        if (entities.containsKey(var0)) {
+        if (entities.containsKey(var0))
             return Optional.of(entities.get(var0));
-        }
         return this.wrapped.getOptional(var0);
     }
 
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 229cc66ad..8d9ac4177 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
@@ -64,9 +64,9 @@ public class EntityMoveControl extends MoveControl {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
@@ -92,10 +92,9 @@ public class EntityMoveControl extends MoveControl {
         double dZ = this.tz - this.entity.getZ();
         double dY = this.ty - this.entity.getY();
         double dXZ = Math.sqrt(dX * dX + dZ * dZ);
-        if (Math.abs(dY) < 1.0 && dXZ < 0.01) {
+        if (Math.abs(dY) < 1.0 && dXZ < 0.01)
             // this.entity.zza = 0.0F;
             return;
-        }
 
         if (dXZ > 0.4) {
             float f = (float) Math.toDegrees(Mth.atan2(dZ, dX)) - 90.0F;
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 5018972db..d477f74c8 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
@@ -66,8 +66,8 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     public boolean canCutCorner(BlockPathTypes pathtype) {
-        return (pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_POWDER_SNOW
-                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR);
+        return pathtype != BlockPathTypes.DANGER_FIRE && pathtype != BlockPathTypes.DANGER_POWDER_SNOW
+                && pathtype != BlockPathTypes.DANGER_OTHER && pathtype != BlockPathTypes.WALKABLE_DOOR;
     }
 
     @Override
@@ -137,7 +137,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected boolean canUpdatePath() {
-        return (this.mob.onGround() || this.mob.isInLiquid() || this.mob.isPassenger());
+        return this.mob.onGround() || this.mob.isInLiquid() || this.mob.isPassenger();
     }
 
     @Override
@@ -148,9 +148,8 @@ public class EntityNavigation extends PathNavigation {
                     && this.level.getBlockState(var2).isAir(); var2 = var2.below()) {
             }
 
-            if (var2.getY() > this.level.getMinBuildHeight()) {
+            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();
@@ -159,9 +158,9 @@ public class EntityNavigation extends PathNavigation {
             var0 = var2;
         }
 
-        if (!this.level.getBlockState(var0).isSolid()) {
+        if (!this.level.getBlockState(var0).isSolid())
             return supercreatePath(var0, var1);
-        } else {
+        else {
             for (var2 = var0.above(); var2.getY() < this.level.getMaxBuildHeight()
                     && this.level.getBlockState(var2).isSolid(); var2 = var2.above()) {
             }
@@ -192,7 +191,7 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     protected Path createPath(Set<BlockPos> var0, int var1, boolean headAbove, int reachRange, float range) {
-        if (var0.isEmpty() || (this.mob.getY() < this.level.getMinBuildHeight()) || !canUpdatePath())
+        if (var0.isEmpty() || this.mob.getY() < this.level.getMinBuildHeight() || !canUpdatePath())
             return null;
         if (this.path != null && !this.path.isDone() && var0.contains(this.targetPos))
             return this.path;
@@ -240,10 +239,11 @@ public class EntityNavigation extends PathNavigation {
             } else {
                 this.timeoutCachedNode = blockPos;
                 double var2 = var0.distanceTo(Vec3.atBottomCenterOf(this.timeoutCachedNode));
-                this.timeoutLimit = (this.mob.getSpeed() > 0.0F) ? (var2 / this.mob.getSpeed() * 1000.0D) : 0.0D;
+                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)
+            if (this.timeoutLimit > 0.0D && this.timeoutTimer > this.timeoutLimit * 3.0D) {
                 timeoutPath();
+            }
             this.lastTimeoutCheck = System.currentTimeMillis();
         }
     }
@@ -251,15 +251,16 @@ public class EntityNavigation extends PathNavigation {
     @Override
     protected void followThePath() {
         Vec3 var0 = getTempMobPos();
-        this.maxDistanceToWaypoint = (this.mob.getBbWidth() > 0.75F) ? (this.mob.getBbWidth() / 2.0F)
-                : (0.75F - this.mob.getBbWidth() / 2.0F);
+        this.maxDistanceToWaypoint = this.mob.getBbWidth() > 0.75F ? this.mob.getBbWidth() / 2.0F
+                : 0.75F - this.mob.getBbWidth() / 2.0F;
         BlockPos blockPos = this.path.getNextNodePos();
         double var2 = Math.abs(this.mob.getX() - (blockPos.getX() + 0.5D));
         double var4 = Math.abs(this.mob.getY() - blockPos.getY());
         double var6 = Math.abs(this.mob.getZ() - (blockPos.getZ() + 0.5D));
-        boolean var8 = (var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D);
-        if (var8 || (canCutCorner((this.path.getNextNode()).type) && shouldTargetNextNodeInDirection(var0)))
+        boolean var8 = var2 < this.maxDistanceToWaypoint && var6 < this.maxDistanceToWaypoint && var4 < 1.0D;
+        if (var8 || canCutCorner(this.path.getNextNode().type) && shouldTargetNextNodeInDirection(var0)) {
             this.path.advance();
+        }
         doStuckDetection(var0);
     }
 
@@ -289,9 +290,8 @@ public class EntityNavigation extends PathNavigation {
             int var2 = 0;
 
             do {
-                if (!var1.is(Blocks.WATER)) {
+                if (!var1.is(Blocks.WATER))
                     return var0;
-                }
 
                 ++var0;
                 var1 = this.level.getBlockState(BlockPos.containing(this.mob.getX(), var0, this.mob.getZ()));
@@ -299,9 +299,8 @@ public class EntityNavigation extends PathNavigation {
             } while (var2 <= 16);
 
             return this.mob.getBlockY();
-        } else {
+        } else
             return Mth.floor(this.mob.getY() + 0.5);
-        }
     }
 
     @Override
@@ -315,18 +314,15 @@ public class EntityNavigation extends PathNavigation {
     }
 
     protected boolean hasValidPathType(BlockPathTypes var0) {
-        if (var0 == BlockPathTypes.WATER) {
+        if ((var0 == BlockPathTypes.WATER) || (var0 == BlockPathTypes.LAVA))
             return false;
-        } else if (var0 == BlockPathTypes.LAVA) {
-            return false;
-        } else {
+        else
             return var0 != BlockPathTypes.OPEN;
-        }
     }
 
     @Override
     public boolean isDone() {
-        return (this.path == null || this.path.isDone());
+        return this.path == null || this.path.isDone();
     }
 
     @Override
@@ -353,7 +349,7 @@ public class EntityNavigation extends PathNavigation {
     @Override
     public boolean moveTo(Entity var0, double var1) {
         Path var3 = createPath(var0, 1);
-        return (var3 != null && moveTo(var3, var1));
+        return var3 != null && moveTo(var3, var1);
     }
 
     @Override
@@ -362,8 +358,9 @@ public class EntityNavigation extends PathNavigation {
             this.path = null;
             return false;
         }
-        if (!var0.sameAs(this.path))
+        if (!var0.sameAs(this.path)) {
             this.path = var0;
+        }
         if (isDone())
             return false;
         trimPath();
@@ -435,15 +432,13 @@ public class EntityNavigation extends PathNavigation {
 
     @Override
     public boolean shouldRecomputePath(BlockPos var0) {
-        if (this.hasDelayedRecomputation) {
+        if (this.hasDelayedRecomputation || ((this.path == null) || this.path.isDone() || (this.path.getNodeCount() == 0)))
             return false;
-        } else if (this.path != null && !this.path.isDone() && this.path.getNodeCount() != 0) {
+        else {
             Node var1 = this.path.getEndNode();
             Vec3 var2 = new Vec3((var1.x + this.mob.getX()) / 2.0D, (var1.y + this.mob.getY()) / 2.0D,
                     (var1.z + this.mob.getZ()) / 2.0D);
             return var0.closerToCenterThan(var2, this.path.getNodeCount() - this.path.getNextNodeIndex());
-        } else {
-            return false;
         }
     }
 
@@ -456,7 +451,7 @@ public class EntityNavigation extends PathNavigation {
         Vec3 var2 = Vec3.atBottomCenterOf(this.path.getNodePos(this.path.getNextNodeIndex() + 1));
         Vec3 var3 = var2.subtract(var1);
         Vec3 var4 = var0.subtract(var1);
-        return (var3.dot(var4) > 0.0D);
+        return var3.dot(var4) > 0.0D;
     }
 
     @Override
@@ -498,8 +493,9 @@ public class EntityNavigation extends PathNavigation {
             Vec3 vec31 = getTempMobPos();
             Vec3 vec32 = this.path.getNextEntityPos(this.mob);
             if (vec31.y > vec32.y && !this.mob.onGround() && Mth.floor(vec31.x) == Mth.floor(vec32.x)
-                    && Mth.floor(vec31.z) == Mth.floor(vec32.z))
+                    && Mth.floor(vec31.z) == Mth.floor(vec32.z)) {
                 this.path.advance();
+            }
         }
         if (isDone())
             return;
@@ -516,9 +512,8 @@ public class EntityNavigation extends PathNavigation {
     protected void trimPath() {
         supertrimPath();
         if (this.avoidSun) {
-            if (this.level.canSeeSky(BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ()))) {
+            if (this.level.canSeeSky(BlockPos.containing(this.mob.getX(), this.mob.getY() + 0.5, this.mob.getZ())))
                 return;
-            }
 
             for (int var0 = 0; var0 < this.path.getNodeCount(); ++var0) {
                 Node var1 = this.path.getNode(var0);
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 7bf6364cf..8d377f4f7 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
@@ -49,9 +49,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
         for (int var4 = 1; var4 <= var3; ++var4) {
             var1 = var1.move(var2);
-            if (this.hasCollisions(var1)) {
+            if (this.hasCollisions(var1))
                 return false;
-            }
         }
 
         return true;
@@ -93,9 +92,9 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         Node var8 = null;
         BlockPos.MutableBlockPos var9 = new BlockPos.MutableBlockPos();
         double var10 = this.getFloorLevel(var9.set(var0, var1, var2));
-        if (var10 - var4 > this.getMobJumpHeight()) {
+        if (var10 - var4 > this.getMobJumpHeight())
             return null;
-        } else {
+        else {
             BlockPathTypes var12 = this.getCachedBlockType(this.mob, var0, var1, var2);
             float var13 = this.mvmt.getPathfindingMalus(var12);
             double var14 = this.mob.getBbWidth() / 2.0;
@@ -109,8 +108,6 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             }
 
             if (var12 == BlockPathTypes.WALKABLE || this.isAmphibious() && var12 == BlockPathTypes.WATER) {
-                return var8;
-            } else {
                 if ((var8 == null || var8.costMalus < 0.0F) && var3 > 0
                         && (var12 != BlockPathTypes.FENCE || this.canWalkOverFences())
                         && var12 != BlockPathTypes.UNPASSABLE_RAIL && var12 != BlockPathTypes.TRAPDOOR
@@ -134,16 +131,14 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                 }
 
                 if (!this.isAmphibious() && var12 == BlockPathTypes.WATER && !this.canFloat()) {
-                    if (this.getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER) {
+                    if (this.getCachedBlockType(this.mob, var0, var1 - 1, var2) != BlockPathTypes.WATER)
                         return var8;
-                    }
 
                     while (var1 > this.mob.level().getMinBuildHeight()) {
                         --var1;
                         var12 = this.getCachedBlockType(this.mob, var0, var1, var2);
-                        if (var12 != BlockPathTypes.WATER) {
+                        if (var12 != BlockPathTypes.WATER)
                             return var8;
-                        }
 
                         var8 = this.getNodeAndUpdateCostToMax(var0, var1, var2, var12,
                                 this.mvmt.getPathfindingMalus(var12));
@@ -156,13 +151,11 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
 
                     while (var12 == BlockPathTypes.OPEN) {
                         --var1;
-                        if (var1 < this.mob.level().getMinBuildHeight()) {
+                        if (var1 < this.mob.level().getMinBuildHeight())
                             return this.getBlockedNode(var0, var17, var2);
-                        }
 
-                        if (var16++ >= this.mob.getMaxFallDistance()) {
+                        if (var16++ >= this.mob.getMaxFallDistance())
                             return this.getBlockedNode(var0, var1, var2);
-                        }
 
                         var12 = this.getCachedBlockType(this.mob, var0, var1, var2);
                         var13 = this.mvmt.getPathfindingMalus(var12);
@@ -171,9 +164,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                             break;
                         }
 
-                        if (var13 < 0.0F) {
+                        if (var13 < 0.0F)
                             return this.getBlockedNode(var0, var1, var2);
-                        }
                     }
                 }
 
@@ -183,9 +175,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     var8.type = var12;
                     var8.costMalus = var12.getMalus();
                 }
-
-                return var8;
             }
+            return var8;
         }
     }
 
@@ -205,30 +196,28 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         EnumSet var5 = EnumSet.noneOf(BlockPathTypes.class);
         BlockPathTypes var6 = BlockPathTypes.BLOCKED;
         var6 = this.getBlockPathTypes(var0, var1, var2, var3, var5, var6, var4.blockPosition());
-        if (var5.contains(BlockPathTypes.FENCE)) {
+        if (var5.contains(BlockPathTypes.FENCE))
             return BlockPathTypes.FENCE;
-        } else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL)) {
+        else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL))
             return BlockPathTypes.UNPASSABLE_RAIL;
-        } else {
+        else {
             BlockPathTypes var7 = BlockPathTypes.BLOCKED;
             Iterator var9 = var5.iterator();
 
             while (var9.hasNext()) {
                 BlockPathTypes varr9 = (BlockPathTypes) var9.next();
-                if (mvmt.getPathfindingMalus(varr9) < 0.0F) {
+                if (mvmt.getPathfindingMalus(varr9) < 0.0F)
                     return varr9;
-                }
 
                 if (mvmt.getPathfindingMalus(varr9) >= mvmt.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
             }
 
-            if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1) {
+            if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
-            } else {
+            else
                 return var7;
-            }
         }
     }
 
@@ -237,30 +226,28 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
         EnumSet var5 = EnumSet.noneOf(BlockPathTypes.class);
         BlockPathTypes var6 = BlockPathTypes.BLOCKED;
         var6 = this.getBlockPathTypes(var0, var1, var2, var3, var5, var6, var4.blockPosition());
-        if (var5.contains(BlockPathTypes.FENCE)) {
+        if (var5.contains(BlockPathTypes.FENCE))
             return BlockPathTypes.FENCE;
-        } else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL)) {
+        else if (var5.contains(BlockPathTypes.UNPASSABLE_RAIL))
             return BlockPathTypes.UNPASSABLE_RAIL;
-        } else {
+        else {
             BlockPathTypes var7 = BlockPathTypes.BLOCKED;
             Iterator var9 = var5.iterator();
 
             while (var9.hasNext()) {
                 BlockPathTypes varr9 = (BlockPathTypes) var9.next();
-                if (mvmt.getPathfindingMalus(varr9) < 0.0F) {
+                if (mvmt.getPathfindingMalus(varr9) < 0.0F)
                     return varr9;
-                }
 
                 if (mvmt.getPathfindingMalus(varr9) >= mvmt.getPathfindingMalus(var7)) {
                     var7 = varr9;
                 }
             }
 
-            if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1) {
+            if (var6 == BlockPathTypes.OPEN && mvmt.getPathfindingMalus(var7) == 0.0F && this.entityWidth <= 1)
                 return BlockPathTypes.OPEN;
-            } else {
+            else
                 return var7;
-            }
         }
     }
 
@@ -291,9 +278,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     protected BlockPathTypes getCachedBlockType(LivingEntity var0, int var1, int var2, int var3) {
-        return (BlockPathTypes) this.pathTypesByPosCache.computeIfAbsent(BlockPos.asLong(var1, var2, var3), (var4) -> {
-            return this.getBlockPathType(this.level, var1, var2, var3, var0);
-        });
+        return (BlockPathTypes) this.pathTypesByPosCache.computeIfAbsent(BlockPos.asLong(var1, var2, var3),
+                var4 -> this.getBlockPathType(this.level, var1, var2, var3, var0));
     }
 
     protected double getFloorLevel(BlockPos var0) {
@@ -417,9 +403,8 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
             if (this.canStartAt(var1.set(var4.minX, var0, var4.minZ))
                     || this.canStartAt(var1.set(var4.minX, var0, var4.maxZ))
                     || this.canStartAt(var1.set(var4.maxX, var0, var4.minZ))
-                    || this.canStartAt(var1.set(var4.maxX, var0, var4.maxZ))) {
+                    || this.canStartAt(var1.set(var4.maxX, var0, var4.maxZ)))
                 return this.getStartNode(var1);
-            }
         }
 
         return this.getStartNode(new BlockPos(var3.getX(), var0, var3.getZ()));
@@ -433,9 +418,7 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     private boolean hasCollisions(AABB var0) {
-        return this.collisionCache.computeIfAbsent(var0, (var1) -> {
-            return !this.level.noCollision(this.mob, var0);
-        });
+        return this.collisionCache.computeIfAbsent(var0, var1 -> !this.level.noCollision(this.mob, var0));
     }
 
     protected boolean isAmphibious() {
@@ -443,25 +426,19 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     }
 
     protected boolean isDiagonalValid(Node var0, Node var1, Node var2, Node var3) {
-        if (var3 != null && var2 != null && var1 != null) {
-            if (var3.closed) {
-                return false;
-            } else if (var2.y <= var0.y && var1.y <= var0.y) {
-                if (var1.type != BlockPathTypes.WALKABLE_DOOR && var2.type != BlockPathTypes.WALKABLE_DOOR
-                        && var3.type != BlockPathTypes.WALKABLE_DOOR) {
-                    boolean var4 = var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
-                            && this.mob.getBbWidth() < 0.5;
-                    return var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
-                            && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        } else {
+        if (((var3 == null) || (var2 == null) || (var1 == null)) || var3.closed)
+            return false;
+        else if (var2.y <= var0.y && var1.y <= var0.y) {
+            if (var1.type != BlockPathTypes.WALKABLE_DOOR && var2.type != BlockPathTypes.WALKABLE_DOOR
+                    && var3.type != BlockPathTypes.WALKABLE_DOOR) {
+                boolean var4 = var2.type == BlockPathTypes.FENCE && var1.type == BlockPathTypes.FENCE
+                        && this.mob.getBbWidth() < 0.5;
+                return var3.costMalus >= 0.0F && (var2.y < var0.y || var2.costMalus >= 0.0F || var4)
+                        && (var1.y < var0.y || var1.costMalus >= 0.0F || var4);
+            } else
+                return false;
+        } else
             return false;
-        }
     }
 
     protected boolean isNeighborValid(Node var0, Node var1) {
@@ -492,21 +469,17 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
                     if (var6 != 0 || var8 != 0) {
                         var1.set(var3 + var6, var4 + var7, var5 + var8);
                         BlockState var9 = var0.getBlockState(var1);
-                        if (var9.is(Blocks.CACTUS) || var9.is(Blocks.SWEET_BERRY_BUSH)) {
+                        if (var9.is(Blocks.CACTUS) || var9.is(Blocks.SWEET_BERRY_BUSH))
                             return BlockPathTypes.DANGER_OTHER;
-                        }
 
-                        if (isBurningBlock(var9)) {
+                        if (isBurningBlock(var9))
                             return BlockPathTypes.DANGER_FIRE;
-                        }
 
-                        if (var0.getFluidState(var1).is(FluidTags.WATER)) {
+                        if (var0.getFluidState(var1).is(FluidTags.WATER))
                             return BlockPathTypes.WATER_BORDER;
-                        }
 
-                        if (var9.is(Blocks.WITHER_ROSE) || var9.is(Blocks.POINTED_DRIPSTONE)) {
+                        if (var9.is(Blocks.WITHER_ROSE) || var9.is(Blocks.POINTED_DRIPSTONE))
                             return BlockPathTypes.DAMAGE_CAUTIOUS;
-                        }
                     }
                 }
             }
@@ -523,51 +496,46 @@ public class EntityNodeEvaluator extends EntityNodeEvaluatorBase {
     protected static BlockPathTypes getBlockPathTypeRaw(BlockGetter var0, BlockPos var1) {
         BlockState var2 = var0.getBlockState(var1);
         Block var3 = var2.getBlock();
-        if (var2.isAir()) {
+        if (var2.isAir())
             return BlockPathTypes.OPEN;
-        } else if (!var2.is(BlockTags.TRAPDOORS) && !var2.is(Blocks.LILY_PAD) && !var2.is(Blocks.BIG_DRIPLEAF)) {
-            if (var2.is(Blocks.POWDER_SNOW)) {
+        else if (!var2.is(BlockTags.TRAPDOORS) && !var2.is(Blocks.LILY_PAD) && !var2.is(Blocks.BIG_DRIPLEAF)) {
+            if (var2.is(Blocks.POWDER_SNOW))
                 return BlockPathTypes.POWDER_SNOW;
-            } else if (!var2.is(Blocks.CACTUS) && !var2.is(Blocks.SWEET_BERRY_BUSH)) {
-                if (var2.is(Blocks.HONEY_BLOCK)) {
+            else if (!var2.is(Blocks.CACTUS) && !var2.is(Blocks.SWEET_BERRY_BUSH)) {
+                if (var2.is(Blocks.HONEY_BLOCK))
                     return BlockPathTypes.STICKY_HONEY;
-                } else if (var2.is(Blocks.COCOA)) {
+                else if (var2.is(Blocks.COCOA))
                     return BlockPathTypes.COCOA;
-                } else if (!var2.is(Blocks.WITHER_ROSE) && !var2.is(Blocks.POINTED_DRIPSTONE)) {
+                else if (!var2.is(Blocks.WITHER_ROSE) && !var2.is(Blocks.POINTED_DRIPSTONE)) {
                     FluidState var4 = var0.getFluidState(var1);
-                    if (var4.is(FluidTags.LAVA)) {
+                    if (var4.is(FluidTags.LAVA))
                         return BlockPathTypes.LAVA;
-                    } else if (isBurningBlock(var2)) {
+                    else if (isBurningBlock(var2))
                         return BlockPathTypes.DAMAGE_FIRE;
-                    } else if (var3 instanceof DoorBlock) {
+                    else if (var3 instanceof DoorBlock) {
                         DoorBlock var5 = (DoorBlock) var3;
-                        if (var2.getValue(DoorBlock.OPEN)) {
+                        if (var2.getValue(DoorBlock.OPEN))
                             return BlockPathTypes.DOOR_OPEN;
-                        } else {
+                        else
                             return var5.type().canOpenByHand() ? BlockPathTypes.DOOR_WOOD_CLOSED
                                     : BlockPathTypes.DOOR_IRON_CLOSED;
-                        }
-                    } else if (var3 instanceof BaseRailBlock) {
+                    } else if (var3 instanceof BaseRailBlock)
                         return BlockPathTypes.RAIL;
-                    } else if (var3 instanceof LeavesBlock) {
+                    else if (var3 instanceof LeavesBlock)
                         return BlockPathTypes.LEAVES;
-                    } else if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS)
-                            || var3 instanceof FenceGateBlock && !(Boolean) var2.getValue(FenceGateBlock.OPEN)) {
+                    else if (var2.is(BlockTags.FENCES) || var2.is(BlockTags.WALLS)
+                            || var3 instanceof FenceGateBlock && !(Boolean) var2.getValue(FenceGateBlock.OPEN))
                         return BlockPathTypes.FENCE;
-                    } else if (!var2.isPathfindable(var0, var1, PathComputationType.LAND)) {
+                    else if (!var2.isPathfindable(var0, var1, PathComputationType.LAND))
                         return BlockPathTypes.BLOCKED;
-                    } else {
+                    else
                         return var4.is(FluidTags.WATER) ? BlockPathTypes.WATER : BlockPathTypes.OPEN;
-                    }
-                } else {
+                } else
                     return BlockPathTypes.DAMAGE_CAUTIOUS;
-                }
-            } else {
+            } else
                 return BlockPathTypes.DAMAGE_OTHER;
-            }
-        } else {
+        } else
             return BlockPathTypes.TRAPDOOR;
-        }
     }
 
     public static BlockPathTypes getBlockPathTypeStatic(BlockGetter var0, BlockPos.MutableBlockPos var1) {
diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluatorBase.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluatorBase.java
index cfd57abbf..eaa7baf0b 100644
--- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluatorBase.java
+++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/EntityNodeEvaluatorBase.java
@@ -21,7 +21,7 @@ public abstract class EntityNodeEvaluatorBase extends NodeEvaluator {
     protected PathNavigationRegion level;
     protected LivingEntity mob;
     protected MobAI mvmt;
-    protected final Int2ObjectMap<Node> nodes = new Int2ObjectOpenHashMap<Node>();
+    protected final Int2ObjectMap<Node> nodes = new Int2ObjectOpenHashMap<>();
 
     @Override
     public boolean canFloat() {
@@ -57,9 +57,7 @@ public abstract class EntityNodeEvaluatorBase extends NodeEvaluator {
 
     @Override
     protected Node getNode(int var0, int var1, int var2) {
-        return this.nodes.computeIfAbsent(Node.createHash(var0, var1, var2), (var3) -> {
-            return new Node(var0, var1, var2);
-        });
+        return this.nodes.computeIfAbsent(Node.createHash(var0, var1, var2), var3 -> new Node(var0, var1, var2));
     }
 
     @Override
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 6d48f2d72..838360a63 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
@@ -98,7 +98,7 @@ public class EntityPathfinder extends PathFinder {
                 break;
             }
 
-            if (!(var11.distanceTo(var1) >= range)) {
+            if ((var11.distanceTo(var1) < range)) {
                 int var12 = this.nodeEvaluator.getNeighbors(this.neighbors, var11);
 
                 for (int var13 = 0; var13 < var12; ++var13) {
@@ -121,15 +121,13 @@ public class EntityPathfinder extends PathFinder {
             }
         }
 
-        Optional<Path> var11 = !var9.isEmpty() ? var9.stream().map((var1x) -> {
-            return this.reconstructPath(var1x.getBestNode(), var2.get(var1x), true);
-        }).min(Comparator.comparingInt(Path::getNodeCount)) : getFallbackDestinations(var2, var6).findFirst();
+        Optional<Path> var11 = !var9.isEmpty() ? var9.stream().map(var1x -> this.reconstructPath(var1x.getBestNode(), var2.get(var1x), true)).min(Comparator.comparingInt(Path::getNodeCount)) : getFallbackDestinations(var2, var6).findFirst();
         /*var6.stream().map((var1x) -> {
            return this.reconstructPath(var1x.getBestNode(), (BlockPos)var2.get(var1x), false);
         }).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount))*/
-        if (var11.isEmpty()) {
+        if (var11.isEmpty())
             return null;
-        } else {
+        else {
             Path var12 = var11.get();
             return var12;
         }
@@ -146,12 +144,9 @@ public class EntityPathfinder extends PathFinder {
     }
 
     public Stream<Path> getFallbackDestinations(Map<Target, BlockPos> var1, Set<Target> var5) {
-        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean()) {
+        if (Setting.DISABLE_MC_NAVIGATION_FALLBACK.asBoolean())
             return Stream.empty();
-        }
-        return var5.stream().map((var1x) -> {
-            return this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false);
-        }).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
+        return var5.stream().map(var1x -> this.reconstructPath(var1x.getBestNode(), var1.get(var1x), false)).sorted(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
     }
 
     private Path reconstructPath(Node var0, BlockPos var1, boolean var2) {
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 7f5f646d3..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
@@ -168,9 +168,8 @@ public interface MobAI {
                     mob.getJumpControl().tick();
                 }
             };
-        } else if (handle instanceof 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 7b791dff8..ec907be3c 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
@@ -581,9 +581,8 @@ public class NMSImpl implements NMSBridge {
         } catch (Throwable e) {
             e.printStackTrace();
         }
-        if (bserver == null) {
+        if (bserver == null)
             return null;
-        }
         BossBar ret = Bukkit.createBossBar("", BarColor.BLUE, BarStyle.SEGMENTED_10);
         try {
             CRAFT_BOSSBAR_HANDLE_FIELD.invoke(ret, bserver);
@@ -610,9 +609,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         MobAI ai = MobAI.from(handle);
         MoveControl controller = ai != null ? ai.getMoveControl() : null;
-        if (controller == null || !controller.hasWanted()) {
+        if (controller == null || !controller.hasWanted())
             return null;
-        }
         return new Location(entity.getWorld(), controller.getWantedX(), controller.getWantedY(),
                 controller.getWantedZ());
     }
@@ -624,9 +622,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof org.bukkit.entity.LivingEntity)) {
+        if (!(entity instanceof org.bukkit.entity.LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((org.bukkit.entity.LivingEntity) entity).getYHeadRot();
     }
 
@@ -687,7 +684,7 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         if (handle == null || handle.passengers == null)
             return Lists.newArrayList();
-        return Lists.transform(handle.passengers, input -> input.getBukkitEntity());
+        return Lists.transform(handle.passengers, Entity::getBukkitEntity);
     }
 
     @Override
@@ -699,9 +696,8 @@ public class NMSImpl implements NMSBridge {
     public GameProfile getProfile(SkullMeta meta) {
         if (SKULL_META_PROFILE == null) {
             SKULL_META_PROFILE = NMS.getFirstGetter(meta.getClass(), GameProfile.class);
-            if (SKULL_META_PROFILE == null) {
+            if (SKULL_META_PROFILE == null)
                 return null;
-            }
         }
         try {
             return (GameProfile) SKULL_META_PROFILE.invoke(meta);
@@ -734,8 +730,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof org.bukkit.entity.LivingEntity))
             return DEFAULT_SPEED;
         LivingEntity handle = getHandle((org.bukkit.entity.LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttribute(Attributes.d).getValue();
@@ -749,22 +745,16 @@ public class NMSImpl implements NMSBridge {
     @Override
     public MCNavigator getTargetNavigator(org.bukkit.entity.Entity entity, Iterable<Vector> nodes,
             final NavigatorParameters params) {
-        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(nodes, (input) -> {
-            return new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ());
-        }));
+        List<Node> list = Lists.<Node> newArrayList(Iterables.<Vector, Node> transform(nodes, input -> new Node(input.getBlockX(), input.getBlockY(), input.getBlockZ())));
         Node last = list.size() > 0 ? list.get(list.size() - 1) : null;
         final Path path = new Path(list, last != null ? new BlockPos(last.x, last.y, last.z) : null, true);
-        return getTargetNavigator(entity, params, (input) -> {
-            return input.moveTo(path, params.speed());
-        });
+        return getTargetNavigator(entity, params, input -> input.moveTo(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, input -> {
-            return input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-        });
+        return getTargetNavigator(entity, params, input -> input.moveTo(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -870,11 +860,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.getVehicle();
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -1099,7 +1088,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -1111,8 +1100,9 @@ public class NMSImpl implements NMSBridge {
             double pitch = distanceY == 0 ? 0
                     : Math.toDegrees(Math.acos(yDiff / distanceY))
                             - (handle.getBukkitEntity().getType() == EntityType.PHANTOM ? 45 : 90);
-            if (zDiff < 0.0)
+            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 {
@@ -1143,7 +1133,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = getHandle(from), target = getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof Mob) && !(handle instanceof MobAI))) {
+                || !(handle instanceof Mob) && !(handle instanceof MobAI)) {
             if (to instanceof org.bukkit.entity.LivingEntity) {
                 look(from, ((org.bukkit.entity.LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -1178,8 +1168,9 @@ public class NMSImpl implements NMSBridge {
         GameProfile playerProfile = null;
         for (int i = 0; i < list.size(); i++) {
             ClientboundPlayerInfoUpdatePacket.Entry npcInfo = list.get(i);
-            if (npcInfo == null)
+            if (npcInfo == null) {
                 continue;
+            }
 
             MirrorTrait trait = mirrorTraits.apply(npcInfo.profileId());
             if (trait == null || !trait.isMirroring(player)) {
@@ -1209,8 +1200,9 @@ public class NMSImpl implements NMSBridge {
             }
 
             Collection<Property> textures = playerProfile.getProperties().get("textures");
-            if (textures == null || textures.size() == 0)
+            if (textures == null || textures.size() == 0) {
                 continue;
+            }
 
             npcInfo.profile().getProperties().clear();
             for (String key : playerProfile.getProperties().keySet()) {
@@ -1298,8 +1290,9 @@ public class NMSImpl implements NMSBridge {
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
             net.minecraft.world.entity.EntityType<?> type = ENTITY_REGISTRY.findType(search);
             ResourceLocation key = ENTITY_REGISTRY.getKey(type);
-            if (key == null || type == null)
+            if (key == null || type == null) {
                 continue;
+            }
             CITIZENS_ENTITY_TYPES.put(clazz, type);
             int code = ENTITY_REGISTRY.getId(type);
             ENTITY_REGISTRY.put(code, key, type);
@@ -1598,9 +1591,8 @@ public class NMSImpl implements NMSBridge {
     public void setProfile(SkullMeta meta, GameProfile profile) {
         if (SET_PROFILE_METHOD == null) {
             SET_PROFILE_METHOD = NMS.getMethodHandle(meta.getClass(), "setProfile", true, GameProfile.class);
-            if (SET_PROFILE_METHOD == null) {
+            if (SET_PROFILE_METHOD == null)
                 return;
-            }
         }
         try {
             SET_PROFILE_METHOD.invoke(meta, profile);
@@ -1930,9 +1922,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.moveTo(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -2021,9 +2012,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.nbt.CompoundTag tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.getAllKeys()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -2032,25 +2022,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.nbt.Tag base) {
-        if (base instanceof net.minecraft.nbt.IntTag) {
+        if (base instanceof net.minecraft.nbt.IntTag)
             return new IntTag(key, ((net.minecraft.nbt.IntTag) base).getAsInt());
-        } else if (base instanceof net.minecraft.nbt.FloatTag) {
+        else if (base instanceof net.minecraft.nbt.FloatTag)
             return new FloatTag(key, ((net.minecraft.nbt.FloatTag) base).getAsFloat());
-        } else if (base instanceof net.minecraft.nbt.DoubleTag) {
+        else if (base instanceof net.minecraft.nbt.DoubleTag)
             return new DoubleTag(key, ((net.minecraft.nbt.DoubleTag) base).getAsDouble());
-        } else if (base instanceof net.minecraft.nbt.LongTag) {
+        else if (base instanceof net.minecraft.nbt.LongTag)
             return new LongTag(key, ((net.minecraft.nbt.LongTag) base).getAsLong());
-        } else if (base instanceof net.minecraft.nbt.ShortTag) {
+        else if (base instanceof net.minecraft.nbt.ShortTag)
             return new ShortTag(key, ((net.minecraft.nbt.ShortTag) base).getAsShort());
-        } else if (base instanceof net.minecraft.nbt.ByteTag) {
+        else if (base instanceof net.minecraft.nbt.ByteTag)
             return new ByteTag(key, ((net.minecraft.nbt.ByteTag) base).getAsByte());
-        } else if (base instanceof net.minecraft.nbt.ByteArrayTag) {
+        else if (base instanceof net.minecraft.nbt.ByteArrayTag)
             return new ByteArrayTag(key, ((net.minecraft.nbt.ByteArrayTag) base).getAsByteArray());
-        } else if (base instanceof net.minecraft.nbt.IntArrayTag) {
+        else if (base instanceof net.minecraft.nbt.IntArrayTag)
             return new IntArrayTag(key, ((net.minecraft.nbt.IntArrayTag) base).getAsIntArray());
-        } else if (base instanceof net.minecraft.nbt.StringTag) {
+        else if (base instanceof net.minecraft.nbt.StringTag)
             return new StringTag(key, base.getAsString());
-        } else if (base instanceof net.minecraft.nbt.ListTag) {
+        else if (base instanceof net.minecraft.nbt.ListTag) {
             List<net.minecraft.nbt.Tag> list = (List<net.minecraft.nbt.Tag>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -2060,19 +2050,17 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } else if (base instanceof net.minecraft.nbt.CompoundTag) {
-            return convertNBT(((net.minecraft.nbt.CompoundTag) base));
-        } else if (base instanceof net.minecraft.nbt.EndTag) {
+        } else if (base instanceof net.minecraft.nbt.CompoundTag)
+            return convertNBT((net.minecraft.nbt.CompoundTag) base);
+        else if (base instanceof net.minecraft.nbt.EndTag)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(LivingEntity entity, Vec3 vec3d) {
         if (entity.isEffectiveAi() || entity.isControlledByLocalInstance()) {
             double d0 = 0.08D;
-            boolean flag = ((entity.getDeltaMovement()).y <= 0.0D);
+            boolean flag = entity.getDeltaMovement().y <= 0.0D;
             if (flag && entity.hasEffect(MobEffects.SLOW_FALLING)) {
                 d0 = 0.01D;
                 entity.fallDistance = 0.0F;
@@ -2083,27 +2071,32 @@ public class NMSImpl implements NMSBridge {
                 float f = entity.isSprinting() ? 0.9F : 0.8F;
                 float f1 = 0.02F;
                 float f2 = EnchantmentHelper.getDepthStrider(entity);
-                if (f2 > 3.0F)
+                if (f2 > 3.0F) {
                     f2 = 3.0F;
-                if (!entity.onGround())
+                }
+                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))
+                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())
+                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);
                 if (entity.horizontalCollision
-                        && entity.isFree(vec3d2.x, vec3d2.y + 0.6D - entity.getY() + d1, vec3d2.z))
+                        && 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);
@@ -2115,16 +2108,19 @@ public class NMSImpl implements NMSBridge {
                 } else {
                     entity.setDeltaMovement(entity.getDeltaMovement().scale(0.5D));
                 }
-                if (!entity.isNoGravity())
+                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.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)
+                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);
@@ -2141,9 +2137,10 @@ public class NMSImpl implements NMSBridge {
                     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)
+                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) {
@@ -2156,13 +2153,14 @@ public class NMSImpl implements NMSBridge {
                     }
                 }
                 if (entity.onGround() && !entity.level().isClientSide && entity.getSharedFlag(7)
-                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled())
+                        && !CraftEventFactory.callToggleGlideEvent(entity, false).isCancelled()) {
                     entity.setSharedFlag(7, false);
+                }
             } else {
-                BlockPos blockposition = BlockPos.containing(entity.getX(), (entity.getBoundingBox()).minY - 0.5D,
+                BlockPos blockposition = BlockPos.containing(entity.getX(), entity.getBoundingBox().minY - 0.5D,
                         entity.getZ());
                 float f5 = entity.level().getBlockState(blockposition).getBlock().getFriction();
-                float f = entity.onGround() ? (f5 * 0.91F) : 0.91F;
+                float f = entity.onGround() ? f5 * 0.91F : 0.91F;
                 Vec3 vec3d6 = entity.handleRelativeFrictionAndCalculateMovement(vec3d, f5);
                 double d7 = vec3d6.y;
                 if (entity.hasEffect(MobEffects.LEVITATION)) {
@@ -2312,11 +2310,10 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static boolean moveFish(NPC npc, Mob handle, Vec3 vec3d) {
-        if (npc == null) {
+        if (npc == null)
             return false;
-        }
         if (!npc.useMinecraftAI() && handle.isInWater() && !npc.getNavigator().isNavigating()) {
-            handle.moveRelative((handle instanceof Dolphin || handle instanceof Axolotl) ? handle.getSpeed()
+            handle.moveRelative(handle instanceof Dolphin || handle instanceof Axolotl ? handle.getSpeed()
                     : handle instanceof Turtle ? 0.1F : 0.01F, vec3d);
             handle.move(MoverType.SELF, handle.getDeltaMovement());
             handle.setDeltaMovement(handle.getDeltaMovement().scale(0.9));
@@ -2366,7 +2363,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -2375,8 +2372,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
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 de2fa1edb..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
@@ -65,9 +65,8 @@ public class ArmorStandController extends MobEntityController {
 
         @Override
         public boolean a(EntityHuman entityhuman, Vec3D vec3d) {
-            if (npc == null) {
+            if (npc == null)
                 return super.a(entityhuman, vec3d);
-            }
             PlayerInteractEntityEvent event = new PlayerInteractEntityEvent((Player) entityhuman.getBukkitEntity(),
                     getBukkitEntity());
             Bukkit.getPluginManager().callEvent(event);
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 871e41e6c..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
@@ -66,7 +66,7 @@ public class BatController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -137,8 +137,9 @@ public class BatController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            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 542b3a381..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
@@ -63,7 +63,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -131,8 +131,9 @@ public class BlazeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            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 8ff705c25..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
@@ -72,7 +72,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -157,8 +157,9 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CaveSpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -169,11 +170,10 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 389ff364e..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
@@ -81,7 +81,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -166,8 +166,9 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ChickenNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -178,11 +179,10 @@ public class ChickenController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8019c6627..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
@@ -84,7 +84,7 @@ public class CowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class CowController extends MobEntityController {
                 return super.a(entityhuman);
             ItemStack itemstack = entityhuman.inventory.getItemInHand();
             if (itemstack != null && itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild
-                    && !this.isBaby()) {
+                    && !this.isBaby())
                 return false;
-            }
             return super.a(entityhuman);
         }
 
@@ -181,8 +180,9 @@ public class CowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CowNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -193,11 +193,10 @@ public class CowController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 866abf78f..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
@@ -76,7 +76,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -173,8 +173,9 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new CreeperNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -185,11 +186,10 @@ public class CreeperController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 da4a45e60..1dc7ae46d 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
@@ -68,7 +68,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -102,8 +102,9 @@ public class EnderDragonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EnderDragonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
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 fd8a42872..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
@@ -72,7 +72,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -106,8 +106,9 @@ public class EndermanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -156,8 +157,9 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -168,19 +170,17 @@ public class EndermanController extends MobEntityController {
 
         @Override
         public boolean k(double d1, double d2, double d3) {
-            if (npc == null) {
+            if (npc == null)
                 return super.k(d1, d2, d3);
-            }
             return false;
         }
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 25325d7d0..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
@@ -72,7 +72,7 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -106,8 +106,9 @@ public class EndermiteController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -132,8 +133,9 @@ public class EndermiteController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -155,8 +157,9 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new EndermiteNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -167,11 +170,10 @@ public class EndermiteController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 3c17b5fa6..5b9a88a85 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
@@ -59,7 +59,7 @@ import net.minecraft.server.v1_8_R3.WorldSettings;
 public class EntityHumanNPC extends EntityPlayer implements NPCHolder, SkinnableEntity {
     private PlayerControllerJump controllerJump;
     private PlayerControllerMove controllerMove;
-    private final Map<Integer, ItemStack> equipmentCache = new HashMap<Integer, ItemStack>();
+    private final Map<Integer, ItemStack> equipmentCache = new HashMap<>();
     private int jumpTicks = 0;
     private PlayerNavigation navigation;
     private final CitizensNPC npc;
@@ -91,9 +91,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean a(EntityPlayer entityplayer) {
-        if (npc != null && trackerEntry == null) {
+        if (npc != null && trackerEntry == null)
             return false;
-        }
         return super.a(entityplayer);
     }
 
@@ -140,16 +139,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
     public void die(DamageSource damagesource) {
         // players that die are not normally removed from the world. when the
         // NPC dies, we are done with the instance and it should be removed.
-        if (dead) {
+        if (dead)
             return;
-        }
         super.die(damagesource);
-        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                world.removeEntity(EntityHumanNPC.this);
-            }
-        }, 15); // give enough time for death and smoke animation
+        Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> world.removeEntity(EntityHumanNPC.this), 15); // give enough time for death and smoke animation
     }
 
     @Override
@@ -217,9 +210,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean inBlock() {
-        if (npc == null || noclip || isSleeping()) {
+        if (npc == null || noclip || isSleeping())
             return super.inBlock();
-        }
         return Util.inBlock(getBukkitEntity());
     }
 
@@ -250,11 +242,10 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
 
     @Override
     public boolean k_() {
-        if (npc == null || !npc.isFlyable()) {
+        if (npc == null || !npc.isFlyable())
             return super.k_();
-        } else {
+        else
             return false;
-        }
     }
 
     @Override
@@ -383,7 +374,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
         for (int slot = 0; slot < this.inventory.armor.length; slot++) {
             ItemStack equipment = getEquipment(slot);
             ItemStack cache = equipmentCache.get(slot);
-            if (!(cache == null && equipment == null)
+            if (((cache != null) || (equipment != null))
                     && (cache == null ^ equipment == null || !ItemStack.equals(cache, equipment))) {
                 itemChanged = true;
                 if (cache != null) {
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 da2ff5e5f..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
@@ -49,7 +49,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -123,8 +123,9 @@ public class GhastController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            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 26ded2653..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
@@ -58,7 +58,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class GiantController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class GiantController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GiantNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -154,11 +156,10 @@ public class GiantController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 9516367ac..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
@@ -58,7 +58,7 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -135,8 +135,9 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new GuardianNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -147,11 +148,10 @@ public class GuardianController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 aaf7e789c..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
@@ -49,6 +49,7 @@ public class HorseController extends MobEntityController {
 
         private final CitizensNPC npc;
         private boolean riding;
+
         public EntityHorseNPC(World world) {
             this(world, null);
         }
@@ -85,7 +86,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -193,8 +194,9 @@ public class HorseController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new HorseNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -205,11 +207,10 @@ public class HorseController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 d17b71b4a..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
@@ -23,7 +23,6 @@ import net.minecraft.server.v1_8_R3.WorldServer;
 
 public class HumanController extends AbstractEntityController {
     public HumanController() {
-        super();
     }
 
     @Override
@@ -46,16 +45,13 @@ public class HumanController extends AbstractEntityController {
         if (skin != null) {
             skin.apply(handle);
         }
-        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
-            @Override
-            public void run() {
-                if (getBukkitEntity() == null || !getBukkitEntity().isValid()
-                        || getBukkitEntity() != handle.getBukkitEntity())
-                    return;
-                boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST,
-                        Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
-                NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
-            }
+        Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), () -> {
+            if (getBukkitEntity() == null || !getBukkitEntity().isValid()
+                    || getBukkitEntity() != handle.getBukkitEntity())
+                return;
+            boolean removeFromPlayerList = npc.data().get(NPC.Metadata.REMOVE_FROM_PLAYERLIST,
+                    Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
+            NMS.addOrRemoveFromPlayerList(getBukkitEntity(), removeFromPlayerList);
         }, 20);
         handle.getBukkitEntity().setSleepingIgnored(true);
         return 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 8ff63aece..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
@@ -58,7 +58,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class IronGolemController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new IronGolemNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -154,11 +156,10 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 1a49ef4c5..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
@@ -64,7 +64,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -98,8 +98,9 @@ public class MagmaCubeController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -147,8 +148,9 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MagmaCubeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -159,11 +161,10 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 d94061d36..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
@@ -75,6 +75,6 @@ public abstract class MobEntityController extends AbstractEntityController {
         }
     }
 
-    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<Class<?>, Constructor<?>>();
+    private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE = new WeakHashMap<>();
     private static final Field UUID_FIELD = NMS.getField(net.minecraft.server.v1_8_R3.Entity.class, "uniqueID");
 }
\ No newline at end of file
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 1ee8db575..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
@@ -68,7 +68,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -109,8 +109,9 @@ public class MushroomCowController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -135,8 +136,9 @@ public class MushroomCowController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -158,8 +160,9 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new MushroomCowNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -170,11 +173,10 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 1362a41f4..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
@@ -67,7 +67,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -108,8 +108,9 @@ public class OcelotController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -134,8 +135,9 @@ public class OcelotController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -157,8 +159,9 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new OcelotNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -169,11 +172,10 @@ public class OcelotController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 cc3cb74c1..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
@@ -68,7 +68,7 @@ public class PigController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -94,9 +94,8 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean bW() {
-            if (npc == null) {
+            if (npc == null)
                 return super.bW();
-            }
             return false;
         }
 
@@ -161,8 +160,9 @@ public class PigController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -173,11 +173,10 @@ public class PigController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 7c876a576..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
@@ -58,7 +58,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class PigZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -118,8 +119,9 @@ public class PigZombieController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -141,8 +143,9 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new PigZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,11 +156,10 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 8a6810476..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
@@ -68,7 +68,7 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -156,8 +156,9 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new RabbitNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -173,11 +174,10 @@ public class RabbitController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 d3153d22c..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
@@ -67,7 +67,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -101,8 +101,9 @@ public class SheepController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -127,8 +128,9 @@ public class SheepController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -150,8 +152,9 @@ public class SheepController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SheepNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -162,11 +165,10 @@ public class SheepController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 12a49170e..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
@@ -58,7 +58,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class SilverfishController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -118,8 +119,9 @@ public class SilverfishController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -141,8 +143,9 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SilverfishNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,11 +156,10 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 a9c1ddf82..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
@@ -58,7 +58,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class SkeletonController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SkeletonNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -154,11 +156,10 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 46598bfc5..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
@@ -64,7 +64,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -148,8 +148,9 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SlimeNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -160,11 +161,10 @@ public class SlimeController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 34cb9f7e1..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
@@ -58,7 +58,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class SnowmanController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SnowmanNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -154,11 +156,10 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 cb9a74284..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
@@ -58,7 +58,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class SpiderController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -118,8 +119,9 @@ public class SpiderController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -141,8 +143,9 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SpiderNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,11 +156,10 @@ public class SpiderController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 fb102df99..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
@@ -58,7 +58,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class SquidController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -134,8 +135,9 @@ public class SquidController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new SquidNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -146,11 +148,10 @@ public class SquidController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 ee533152d..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
@@ -71,7 +71,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -173,8 +173,9 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new VillagerNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -185,11 +186,10 @@ public class VillagerController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 3bcd4d155..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
@@ -58,7 +58,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class WitchController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -118,8 +119,9 @@ public class WitchController extends MobEntityController {
         @Override
         public void E() {
             super.E();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
@@ -141,8 +143,9 @@ public class WitchController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WitchNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -153,11 +156,10 @@ public class WitchController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 d71da093b..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
@@ -49,7 +49,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -89,8 +89,9 @@ public class WitherController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -124,8 +125,9 @@ public class WitherController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            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 64697da56..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
@@ -69,7 +69,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -154,8 +154,9 @@ public class WolfController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new WolfNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -166,11 +167,10 @@ public class WolfController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @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 1c86fda5a..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
@@ -58,7 +58,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public void a(Entity entity, float strength, double dx, double dz) {
-            NMS.callKnockbackEvent(npc, strength, dx, dz, (evt) -> super.a(entity, (float) evt.getStrength(),
+            NMS.callKnockbackEvent(npc, strength, dx, dz, evt -> super.a(entity, (float) evt.getStrength(),
                     evt.getKnockbackVector().getX(), evt.getKnockbackVector().getZ()));
         }
 
@@ -92,8 +92,9 @@ public class ZombieController extends MobEntityController {
             // this method is called by both the entities involved - cancelling
             // it will not stop the NPC from moving.
             super.collide(entity);
-            if (npc != null)
+            if (npc != null) {
                 Util.callCollisionEvent(npc, entity.getBukkitEntity());
+            }
         }
 
         @Override
@@ -142,8 +143,9 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public CraftEntity getBukkitEntity() {
-            if (npc != null && !(bukkitEntity instanceof NPCHolder))
+            if (npc != null && !(bukkitEntity instanceof NPCHolder)) {
                 bukkitEntity = new ZombieNPC(this);
+            }
             return super.getBukkitEntity();
         }
 
@@ -154,11 +156,10 @@ public class ZombieController extends MobEntityController {
 
         @Override
         public boolean k_() {
-            if (npc == null || !npc.isFlyable()) {
+            if (npc == null || !npc.isFlyable())
                 return super.k_();
-            } else {
+            else
                 return false;
-            }
         }
 
         @Override
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 ec0044356..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
@@ -131,21 +131,20 @@ public class BoatController extends MobEntityController {
             byte b0 = 5;
             double d0 = 0.0D;
             for (int i = 0; i < b0; i++) {
-                double d1 = (getBoundingBox()).b + ((getBoundingBox()).e - (getBoundingBox()).b) * (i + 0) / b0
-                        - 0.125D;
-                double d2 = (getBoundingBox()).b + ((getBoundingBox()).e - (getBoundingBox()).b) * (i + 1) / b0
-                        - 0.125D;
-                AxisAlignedBB axisalignedbb = new AxisAlignedBB((getBoundingBox()).a, d1, (getBoundingBox()).c,
-                        (getBoundingBox()).d, d2, (getBoundingBox()).f);
-                if (this.world.b(axisalignedbb, Material.WATER))
+                double d1 = getBoundingBox().b + (getBoundingBox().e - getBoundingBox().b) * (i + 0) / b0 - 0.125D;
+                double d2 = getBoundingBox().b + (getBoundingBox().e - getBoundingBox().b) * (i + 1) / b0 - 0.125D;
+                AxisAlignedBB axisalignedbb = new AxisAlignedBB(getBoundingBox().a, d1, getBoundingBox().c,
+                        getBoundingBox().d, d2, getBoundingBox().f);
+                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);
                 double d5 = Math.sin(this.yaw * Math.PI / 180.0D);
                 for (int j = 0; j < 1.0D + d3 * 60.0D; j++) {
-                    double d6 = (this.random.nextFloat() * 2.0F - 1.0F);
+                    double d6 = this.random.nextFloat() * 2.0F - 1.0F;
                     double d7 = (this.random.nextInt(2) * 2 - 1) * 0.7D;
                     if (this.random.nextBoolean()) {
                         double d8 = this.locX - d4 * d6 * 0.8D + d5 * d7;
@@ -164,22 +163,25 @@ public class BoatController extends MobEntityController {
                 double d = d0 * 2.0D - 1.0D;
                 this.motY += 0.04D * d;
             } else {
-                if (this.motY < 0.0D)
+                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;
-                this.motX += -Math.sin((f * 3.1415927F / 180.0F)) * this.b * entityliving.ba * 0.05000000074505806D;
-                this.motZ += Math.cos((f * 3.1415927F / 180.0F)) * this.b * entityliving.ba * 0.05000000074505806D;
+                this.motX += -Math.sin(f * 3.1415927F / 180.0F) * this.b * entityliving.ba * 0.05000000074505806D;
+                this.motZ += Math.cos(f * 3.1415927F / 180.0F) * this.b * entityliving.ba * 0.05000000074505806D;
             } else if (this.unoccupiedDeceleration >= 0.0D) {
                 this.motX *= this.unoccupiedDeceleration;
                 this.motZ *= this.unoccupiedDeceleration;
-                if (this.motX <= 1.0E-5D)
+                if (this.motX <= 1.0E-5D) {
                     this.motX = 0.0D;
-                if (this.motZ <= 1.0E-5D)
+                }
+                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) {
@@ -190,16 +192,18 @@ public class BoatController extends MobEntityController {
             }
             if (d4 > d3 && this.b < 0.35D) {
                 this.b += (0.35D - this.b) / 35.0D;
-                if (this.b > 0.35D)
+                if (this.b > 0.35D) {
                     this.b = 0.35D;
+                }
             } else {
                 this.b -= (this.b - 0.07D) / 35.0D;
-                if (this.b < 0.07D)
+                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);
+                int l = MathHelper.floor(this.locX + (k % 2 - 0.5D) * 0.8D);
+                int j = MathHelper.floor(this.locZ + (k / 2 - 0.5D) * 0.8D);
                 for (int i1 = 0; i1 < 2; i1++) {
                     int j1 = MathHelper.floor(this.locY) + i1;
                     BlockPosition blockposition = new BlockPosition(l, j1, j);
@@ -235,13 +239,16 @@ public class BoatController extends MobEntityController {
             double d5 = this.yaw;
             double d10 = this.lastX - this.locX;
             double d11 = this.lastZ - this.locZ;
-            if (d10 * d10 + d11 * d11 > 0.001D)
+            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)
+            if (d12 > 20.0D) {
                 d12 = 20.0D;
-            if (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/util/CitizensBlockBreaker.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/CitizensBlockBreaker.java
index 337279db3..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
@@ -35,13 +35,13 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
 
     private float getStrength(Block block) {
         float base = block.g(null, new BlockPosition(0, 0, 0));
-        return base < 0.0F ? 0.0F : (!isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F);
+        return base < 0.0F ? 0.0F : !isDestroyable(block) ? 1.0F / base / 100.0F : strengthMod(block) / base / 30.0F;
     }
 
     private boolean isDestroyable(Block block) {
-        if (block.getMaterial().isAlwaysDestroyable()) {
+        if (block.getMaterial().isAlwaysDestroyable())
             return true;
-        } else {
+        else {
             ItemStack current = getCurrentItem();
             return current != null ? current.b(block) : false;
         }
@@ -64,7 +64,7 @@ public class CitizensBlockBreaker extends AbstractBlockBreaker {
                 }
             }
             if (handle.hasEffect(MobEffectList.FASTER_DIG)) {
-                f *= (1.0F + (handle.getEffect(MobEffectList.FASTER_DIG).getAmplifier() + 1) * 0.2F);
+                f *= 1.0F + (handle.getEffect(MobEffectList.FASTER_DIG).getAmplifier() + 1) * 0.2F;
             }
             if (handle.hasEffect(MobEffectList.SLOWER_DIG)) {
                 float f1 = 1.0F;
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 7a263ffda..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
@@ -369,9 +369,8 @@ public class NMSImpl implements NMSBridge {
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
         MinecraftSessionService sessionService = ((CraftServer) Bukkit.getServer()).getServer().aD();
-        if (!(sessionService instanceof YggdrasilMinecraftSessionService)) {
+        if (!(sessionService instanceof YggdrasilMinecraftSessionService))
             return sessionService.fillProfileProperties(profile, requireSecure);
-        }
         YggdrasilAuthenticationService auth = ((YggdrasilMinecraftSessionService) sessionService)
                 .getAuthenticationService();
         URL url = HttpAuthenticationService
@@ -417,9 +416,8 @@ public class NMSImpl implements NMSBridge {
         Entity handle = getHandle(entity);
         ControllerMove controller = handle instanceof EntityInsentient ? ((EntityInsentient) handle).getControllerMove()
                 : handle instanceof EntityHumanNPC ? ((EntityHumanNPC) handle).getControllerMove() : null;
-        if (controller == null || !controller.a()) {
+        if (controller == null || !controller.a())
             return null;
-        }
         return new Location(entity.getWorld(), controller.d(), controller.e(), controller.f());
     }
 
@@ -430,9 +428,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getHeadYaw(org.bukkit.entity.Entity entity) {
-        if (!(entity instanceof LivingEntity)) {
+        if (!(entity instanceof LivingEntity))
             return entity.getLocation().getYaw();
-        }
         return getHandle((LivingEntity) entity).aK;
     }
 
@@ -541,8 +538,8 @@ public class NMSImpl implements NMSBridge {
         if (!npc.isSpawned() || !(npc.getEntity() instanceof LivingEntity))
             return DEFAULT_SPEED;
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) npc.getEntity());
-        if (handle == null)
-            return DEFAULT_SPEED;
+        if (handle == null) {
+        }
         return DEFAULT_SPEED;
         // return (float)
         // handle.getAttributeInstance(GenericAttributes.d).getValue();
@@ -560,23 +557,14 @@ public class NMSImpl implements NMSBridge {
                 Iterables.transform(dest,
                         input -> new PathPoint(input.getBlockX(), input.getBlockY(), input.getBlockZ())),
                 PathPoint.class));
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(path, params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params, input -> input.a(path, params.speed()));
     }
 
     @Override
     public MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final Location dest,
             final NavigatorParameters params) {
-        return getTargetNavigator(entity, params, new Function<NavigationAbstract, Boolean>() {
-            @Override
-            public Boolean apply(NavigationAbstract input) {
-                return input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed());
-            }
-        });
+        return getTargetNavigator(entity, params,
+                input -> input.a(dest.getX(), dest.getY(), dest.getZ(), params.speed()));
     }
 
     private MCNavigator getTargetNavigator(final org.bukkit.entity.Entity entity, final NavigatorParameters params,
@@ -644,11 +632,10 @@ public class NMSImpl implements NMSBridge {
     @Override
     public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
         Entity handle = NMSImpl.getHandle(entity);
-        if (handle == null) {
+        if (handle == null)
             return null;
-        }
         Entity e = handle.vehicle;
-        return (e == handle || e == null) ? null : e.getBukkitEntity();
+        return e == handle || e == null ? null : e.getBukkitEntity();
     }
 
     @Override
@@ -676,9 +663,8 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public boolean isSolid(org.bukkit.block.Block in) {
-        if (GET_NMS_BLOCK == null) {
+        if (GET_NMS_BLOCK == null)
             return in.getType().isSolid();
-        }
         Block block;
         try {
             block = (Block) GET_NMS_BLOCK.invoke(in);
@@ -776,7 +762,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity entity, Location to, boolean headOnly, boolean immediate) {
         Entity handle = NMSImpl.getHandle(entity);
         if (immediate || headOnly || BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             Location fromLocation = entity.getLocation(FROM_LOCATION);
             double xDiff, yDiff, zDiff;
             xDiff = to.getX() - fromLocation.getX();
@@ -786,8 +772,9 @@ public class NMSImpl implements NMSBridge {
             double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff);
             double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ));
             double pitch = Math.toDegrees(Math.acos(yDiff / distanceY)) - 90;
-            if (zDiff < 0.0)
+            if (zDiff < 0.0) {
                 yaw += Math.abs(180 - yaw) * 2;
+            }
             if (handle instanceof EntityEnderDragon) {
                 yaw = Util.getDragonYaw(handle.getBukkitEntity(), xDiff, zDiff);
             } else {
@@ -818,7 +805,7 @@ public class NMSImpl implements NMSBridge {
     public void look(org.bukkit.entity.Entity from, org.bukkit.entity.Entity to) {
         Entity handle = NMSImpl.getHandle(from), target = NMSImpl.getHandle(to);
         if (BAD_CONTROLLER_LOOK.contains(handle.getBukkitEntity().getType())
-                || (!(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC))) {
+                || !(handle instanceof EntityInsentient) && !(handle instanceof EntityHumanNPC)) {
             if (to instanceof LivingEntity) {
                 look(from, ((LivingEntity) to).getEyeLocation(), false, true);
             } else {
@@ -864,8 +851,6 @@ public class NMSImpl implements NMSBridge {
             @Override
             public CraftInventoryView getBukkitView() {
                 if (this.bukkitEntity != null) {
-                    return this.bukkitEntity;
-                } else {
                     try {
                         this.bukkitEntity = new CraftInventoryView(player,
                                 new CitizensInventoryAnvil(new Location(player.getWorld(), 0, 0, 0),
@@ -876,8 +861,8 @@ public class NMSImpl implements NMSBridge {
                         e.printStackTrace();
                         return super.getBukkitView();
                     }
-                    return this.bukkitEntity;
                 }
+                return this.bukkitEntity;
             }
         };
         container.windowId = handle.nextContainerCounter();
@@ -915,9 +900,8 @@ public class NMSImpl implements NMSBridge {
             boolean removeFromPlayerList = ((NPCHolder) entity).getNPC().data().get("removefromplayerlist",
                     Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean());
             entity.l();
-            if (!removeFromPlayerList) {
+            if (!removeFromPlayerList)
                 return;
-            }
             if (!entity.dead) {
                 try {
                     entity.world.g(entity);
@@ -946,8 +930,9 @@ public class NMSImpl implements NMSBridge {
             return;
         Class<?> search = clazz;
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
-            if (!ENTITY_CLASS_TO_INT.containsKey(search))
+            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));
@@ -1133,8 +1118,9 @@ public class NMSImpl implements NMSBridge {
         EntityLiving handle = (EntityLiving) getHandle(entity);
         yaw = Util.clamp(yaw);
         handle.aJ = yaw;
-        if (!(handle instanceof EntityHuman))
+        if (!(handle instanceof EntityHuman)) {
             handle.aI = yaw;
+        }
         handle.aK = yaw;
     }
 
@@ -1271,8 +1257,8 @@ public class NMSImpl implements NMSBridge {
         EntityPlayer from = (EntityPlayer) getHandle(entity);
         PerPlayerMetadata<Long> meta = CitizensAPI.getLocationLookup().registerMetadata("sleeping", null);
         if (sleep) {
-            List<Player> nearbyPlayers = Lists.newArrayList(Iterables
-                    .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> {
+            List<Player> nearbyPlayers = Lists.newArrayList(
+                    Iterables.filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), p -> {
                         Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString());
                         if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000)
                             return true;
@@ -1311,7 +1297,7 @@ public class NMSImpl implements NMSBridge {
             list.add(new PacketPlayOutEntityTeleport(from));
             for (Player nearby : nearbyPlayers) {
                 nearby.sendBlockChange(bedLoc, Material.BED_BLOCK, facingByte);
-                list.forEach((packet) -> sendPacket(nearby, packet));
+                list.forEach(packet -> sendPacket(nearby, packet));
                 meta.set(nearby.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis());
             }
         } else {
@@ -1440,9 +1426,8 @@ public class NMSImpl implements NMSBridge {
         @Override
         public void setPath() {
             Location location = parameters.entityTargetLocationMapper().apply(target);
-            if (location == null) {
+            if (location == null)
                 throw new IllegalStateException("mapper should not return null");
-            }
             navigation.a(location.getX(), location.getY(), location.getZ(), parameters.speed());
         }
 
@@ -1515,9 +1500,8 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static CompoundTag convertNBT(net.minecraft.server.v1_8_R3.NBTTagCompound tag) {
-        if (tag == null) {
+        if (tag == null)
             return new CompoundTag("", Collections.EMPTY_MAP);
-        }
         Map<String, Tag> tags = Maps.newHashMap();
         for (String key : tag.c()) {
             tags.put(key, convertNBT(key, tag.get(key)));
@@ -1526,25 +1510,25 @@ public class NMSImpl implements NMSBridge {
     }
 
     private static Tag convertNBT(String key, net.minecraft.server.v1_8_R3.NBTBase base) {
-        if (base instanceof net.minecraft.server.v1_8_R3.NBTTagInt) {
+        if (base instanceof net.minecraft.server.v1_8_R3.NBTTagInt)
             return new IntTag(key, ((net.minecraft.server.v1_8_R3.NBTTagInt) base).d());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagFloat) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagFloat)
             return new FloatTag(key, ((net.minecraft.server.v1_8_R3.NBTTagFloat) base).h());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagDouble) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagDouble)
             return new DoubleTag(key, ((net.minecraft.server.v1_8_R3.NBTTagDouble) base).g());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagLong) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagLong)
             return new LongTag(key, ((net.minecraft.server.v1_8_R3.NBTTagLong) base).c());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagShort) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagShort)
             return new ShortTag(key, ((net.minecraft.server.v1_8_R3.NBTTagShort) base).e());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagByte) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagByte)
             return new ByteTag(key, ((net.minecraft.server.v1_8_R3.NBTTagByte) base).f());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagByteArray) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagByteArray)
             return new ByteArrayTag(key, ((net.minecraft.server.v1_8_R3.NBTTagByteArray) base).c());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagIntArray) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagIntArray)
             return new IntArrayTag(key, ((net.minecraft.server.v1_8_R3.NBTTagIntArray) base).c());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagString) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagString)
             return new StringTag(key, base.toString());
-        } else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagList) {
+        else if (base instanceof net.minecraft.server.v1_8_R3.NBTTagList) {
             List<net.minecraft.server.v1_8_R3.NBTBase> list = (List<net.minecraft.server.v1_8_R3.NBTBase>) base;
             List<Tag> converted = Lists.newArrayList();
             if (list.size() > 0) {
@@ -1554,18 +1538,16 @@ public class NMSImpl implements NMSBridge {
                 }
                 return new ListTag(key, tagType, converted);
             }
-            return null;
-        } 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) {
+        } 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)
             return new EndTag();
-        }
         return null;
     }
 
     public static void flyingMoveLogic(EntityLiving entity, float f, float f1) {
         if (entity.bM()) {
-            if ((entity.V())) {
+            if (entity.V()) {
                 double d0 = entity.locY;
                 float f3 = 0.8F;
                 float f4 = 0.02F;
@@ -1586,11 +1568,11 @@ public class NMSImpl implements NMSBridge {
                 entity.motY *= 0.800000011920929D;
                 entity.motZ *= f3;
                 entity.motY -= 0.02D;
-                if ((entity.positionChanged)
-                        && (entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d0, entity.motZ))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d0, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
-            } else if ((entity.ab())) {
+            } else if (entity.ab()) {
                 double d0 = entity.locY;
                 entity.a(f, f1, 0.02F);
                 entity.move(entity.motX, entity.motY, entity.motZ);
@@ -1598,8 +1580,8 @@ public class NMSImpl implements NMSBridge {
                 entity.motY *= 0.5D;
                 entity.motZ *= 0.5D;
                 entity.motY -= 0.02D;
-                if ((entity.positionChanged)
-                        && (entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d0, entity.motZ))) {
+                if (entity.positionChanged
+                        && entity.c(entity.motX, entity.motY + 0.6000000238418579D - entity.locY + d0, entity.motZ)) {
                     entity.motY = 0.30000001192092896D;
                 }
             } else {
@@ -1633,20 +1615,20 @@ 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)) {
+                    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_())) {
+                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
+                if (entity.world.isClientSide && (!entity.world
+                        .isLoaded(new BlockPosition((int) entity.locX, 0, (int) entity.locZ))
+                        || !entity.world
                                 .getChunkAtWorldCoords(new BlockPosition((int) entity.locX, 0, (int) entity.locZ))
-                                .o()))) {
+                                .o())) {
                     if (entity.locY > 0.0D) {
                         entity.motY = -0.1D;
                     } else {
@@ -1736,7 +1718,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void sendPacketNearby(Player from, Location location, Packet<?> packet, double radius) {
-        List<Packet<?>> list = new ArrayList<Packet<?>>();
+        List<Packet<?>> list = new ArrayList<>();
         list.add(packet);
         sendPacketsNearby(from, location, list, radius);
     }
@@ -1745,8 +1727,8 @@ public class NMSImpl implements NMSBridge {
         radius *= radius;
         final org.bukkit.World world = location.getWorld();
         for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
-            if (world != player.getWorld() || (from != null && !player.canSee(from))
-                    || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
+            if (world != player.getWorld() || from != null && !player.canSee(from)
+                    || location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius) {
                 continue;
             }
             for (Packet<?> packet : packets) {
@@ -1768,15 +1750,16 @@ public class NMSImpl implements NMSBridge {
     }
 
     public static void setSize(Entity entity, float f, float f1, boolean justCreated) {
-        if ((f != entity.width) || (f1 != entity.length)) {
+        if (f != entity.width || f1 != entity.length) {
             float f2 = entity.width;
             entity.width = f;
             entity.length = f1;
             entity.a(new AxisAlignedBB(entity.getBoundingBox().a, entity.getBoundingBox().b, entity.getBoundingBox().c,
                     entity.getBoundingBox().a + entity.width, entity.getBoundingBox().b + entity.length,
                     entity.getBoundingBox().c + entity.width));
-            if ((entity.width > f2) && (!justCreated) && (!entity.world.isClientSide))
+            if (entity.width > f2 && !justCreated && !entity.world.isClientSide) {
                 entity.move((f2 - entity.width) / 2, 0.0D, (f2 - entity.width) / 2);
+            }
         }
     }
 
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 29c5a6a47..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
@@ -54,9 +54,9 @@ public class PlayerControllerMove extends ControllerMove {
             f3 = -f2;
         }
         float f4 = f + f3;
-        if (f4 < 0.0F)
+        if (f4 < 0.0F) {
             f4 += 360.0F;
-        else if (f4 > 360.0F) {
+        } else if (f4 > 360.0F) {
             f4 -= 360.0F;
         }
         return f4;
@@ -90,7 +90,7 @@ public class PlayerControllerMove extends ControllerMove {
             this.h = new Random().nextInt(20) + 10;
             this.h /= 3;
             ((EntityInsentient) this.a).getControllerJump().a();
-        } else if (dY >= NMS.getStepHeight(a.getBukkitEntity()) && (dXZ) < 0.4D) {
+        } else if (dY >= NMS.getStepHeight(a.getBukkitEntity()) && dXZ < 0.4D) {
             if (this.a instanceof EntityHumanNPC) {
                 ((EntityHumanNPC) this.a).getControllerJump().a();
             } else {
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 1968402f6..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
@@ -54,9 +54,8 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public PathEntity a(BlockPosition paramBlockPosition) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
         float f1 = i();
         this.c.methodProfiler.a("pathfind");
         BlockPosition localBlockPosition = new BlockPosition(this.b);
@@ -86,9 +85,8 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public PathEntity a(Entity paramEntity) {
-        if (!b()) {
+        if (!b())
             return null;
-        }
         float f1 = i();
         this.c.methodProfiler.a("pathfind");
         BlockPosition localBlockPosition = new BlockPosition(this.b).up();
@@ -103,9 +101,8 @@ public class PlayerNavigation extends NavigationAbstract {
     @Override
     public boolean a(Entity paramEntity, double paramDouble) {
         PathEntity localPathEntity = a(paramEntity);
-        if (localPathEntity != null) {
+        if (localPathEntity != null)
             return a(localPathEntity, paramDouble);
-        }
         return false;
     }
 
@@ -118,9 +115,8 @@ public class PlayerNavigation extends NavigationAbstract {
             Vec3D paramVec3D, double paramDouble1, double paramDouble2) {
         int i = paramInt1 - paramInt4 / 2;
         int j = paramInt3 - paramInt6 / 2;
-        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2)) {
+        if (!b(i, paramInt2, j, paramInt4, paramInt5, paramInt6, paramVec3D, paramDouble1, paramDouble2))
             return false;
-        }
         for (int k = i; k < i + paramInt4; k++) {
             for (int m = j; m < j + paramInt6; m++) {
                 double d1 = k + 0.5D - paramVec3D.a;
@@ -128,10 +124,9 @@ public class PlayerNavigation extends NavigationAbstract {
                 if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                     Block localBlock = this.c.getType(new BlockPosition(k, paramInt2 - 1, m)).getBlock();
                     Material localMaterial = localBlock.getMaterial();
-                    if ((localMaterial == Material.AIR) || ((localMaterial == Material.WATER) && (!this.b.V()))
-                            || (localMaterial == Material.LAVA)) {
+                    if (localMaterial == Material.AIR || localMaterial == Material.WATER && !this.b.V()
+                            || localMaterial == Material.LAVA)
                         return false;
-                    }
                 }
             }
         }
@@ -148,9 +143,8 @@ public class PlayerNavigation extends NavigationAbstract {
             this.d = paramPathEntity;
         }
         d();
-        if (this.d.d() == 0) {
+        if (this.d.d() == 0)
             return false;
-        }
         this.e = paramDouble;
         Vec3D localVec3D = c();
         this.g = this.f;
@@ -176,17 +170,15 @@ public class PlayerNavigation extends NavigationAbstract {
         double d1 = paramVec3D2.a - paramVec3D1.a;
         double d2 = paramVec3D2.c - paramVec3D1.c;
         double d3 = d1 * d1 + d2 * d2;
-        if (d3 < 1.0E-8D) {
+        if (d3 < 1.0E-8D)
             return false;
-        }
         double d4 = 1.0D / Math.sqrt(d3);
         d1 *= d4;
         d2 *= d4;
         paramInt1 += 2;
         paramInt3 += 2;
-        if (!a(i, (int) paramVec3D1.b, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+        if (!a(i, (int) paramVec3D1.b, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
             return false;
-        }
         paramInt1 -= 2;
         paramInt3 -= 2;
         double d5 = 1.0D / Math.abs(d1);
@@ -207,7 +199,7 @@ public class PlayerNavigation extends NavigationAbstract {
         int i1 = MathHelper.floor(paramVec3D2.c);
         int i2 = n - i;
         int i3 = i1 - j;
-        while ((i2 * k > 0) || (i3 * m > 0)) {
+        while (i2 * k > 0 || i3 * m > 0) {
             if (d7 < d8) {
                 d7 += d5;
                 i += k;
@@ -217,16 +209,15 @@ public class PlayerNavigation extends NavigationAbstract {
                 j += m;
                 i3 = i1 - j;
             }
-            if (!a(i, (int) paramVec3D1.b, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2)) {
+            if (!a(i, (int) paramVec3D1.b, j, paramInt1, paramInt2, paramInt3, paramVec3D1, d1, d2))
                 return false;
-            }
         }
         return true;
     }
 
     @Override
     protected boolean b() {
-        return (this.b.onGround) || ((h()) && (o())) || ((this.b.au()));
+        return this.b.onGround || h() && o() || this.b.au();
     }
 
     public void b(boolean paramBoolean) {
@@ -237,13 +228,12 @@ public class PlayerNavigation extends NavigationAbstract {
             Vec3D paramVec3D, double paramDouble1, double paramDouble2) {
         for (BlockPosition localBlockPosition : BlockPosition.a(new BlockPosition(paramInt1, paramInt2, paramInt3),
                 new BlockPosition(paramInt1 + paramInt4 - 1, paramInt2 + paramInt5 - 1, paramInt3 + paramInt6 - 1))) {
-            double d1 = (localBlockPosition.getX() + 0.5D) - paramVec3D.a;
-            double d2 = (localBlockPosition.getZ() + 0.5D) - paramVec3D.c;
+            double d1 = localBlockPosition.getX() + 0.5D - paramVec3D.a;
+            double d2 = localBlockPosition.getZ() + 0.5D - paramVec3D.c;
             if (d1 * paramDouble1 + d2 * paramDouble2 >= 0.0D) {
                 Block localBlock = this.c.getType(localBlockPosition).getBlock();
-                if (!localBlock.b(this.c, localBlockPosition)) {
+                if (!localBlock.b(this.c, localBlockPosition))
                     return false;
-                }
             }
         }
         return true;
@@ -263,9 +253,8 @@ public class PlayerNavigation extends NavigationAbstract {
         super.d();
         if (this.fb) {
             if (this.c.i(new BlockPosition(MathHelper.floor(this.b.locX), (int) (this.b.getBoundingBox().b + 0.5D),
-                    MathHelper.floor(this.b.locZ)))) {
+                    MathHelper.floor(this.b.locZ))))
                 return;
-            }
             for (int i = 0; i < this.d.d(); i++) {
                 PathPoint localPathPoint = this.d.a(i);
                 if (this.c.i(new BlockPosition(localPathPoint.a, localPathPoint.b, localPathPoint.c))) {
@@ -309,27 +298,24 @@ public class PlayerNavigation extends NavigationAbstract {
     @Override
     public void k() {
         this.f += 1;
-        if (m()) {
+        if (m())
             return;
-        }
         if (b()) {
             l();
-        } else if ((this.d != null) && (this.d.e() < this.d.d())) {
+        } else if (this.d != null && this.d.e() < this.d.d()) {
             Vec3D localVec3D = c();
             Vec3D localObject = this.d.a(this.b, this.d.e());
-            if ((localVec3D.b > localObject.b) && (!this.b.onGround)
-                    && (MathHelper.floor(localVec3D.a) == MathHelper.floor(localObject.a))
-                    && (MathHelper.floor(localVec3D.c) == MathHelper.floor(localObject.c))) {
+            if (localVec3D.b > localObject.b && !this.b.onGround
+                    && MathHelper.floor(localVec3D.a) == MathHelper.floor(localObject.a)
+                    && MathHelper.floor(localVec3D.c) == MathHelper.floor(localObject.c)) {
                 this.d.c(this.d.e() + 1);
             }
         }
-        if (m()) {
+        if (m())
             return;
-        }
         Vec3D localVec3D = this.d.a(this.b);
-        if (localVec3D == null) {
+        if (localVec3D == null)
             return;
-        }
         Object localObject = new AxisAlignedBB(localVec3D.a, localVec3D.b, localVec3D.c, localVec3D.a, localVec3D.b,
                 localVec3D.c).grow(0.5D, 0.5D, 0.5D);
         List<AxisAlignedBB> localList = this.c.getCubes(this.b, ((AxisAlignedBB) localObject).a(0.0D, -1.0D, 0.0D));
@@ -372,7 +358,7 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     public boolean m() {
-        return (this.d == null) || (this.d.b());
+        return this.d == null || this.d.b();
     }
 
     @Override
@@ -382,26 +368,24 @@ public class PlayerNavigation extends NavigationAbstract {
 
     @Override
     protected boolean o() {
-        return (this.b.V()) || (this.b.ab());
+        return this.b.V() || this.b.ab();
     }
 
     private int p() {
-        if ((!this.b.V()) || (!h())) {
+        if (!this.b.V() || !h())
             return (int) (this.b.getBoundingBox().b + 0.5D);
-        }
         int i = (int) this.b.getBoundingBox().b;
         Block localBlock = this.c
                 .getType(new BlockPosition(MathHelper.floor(this.b.locX), i, MathHelper.floor(this.b.locZ))).getBlock();
         int j = 0;
-        while ((localBlock == Blocks.FLOWING_WATER) || (localBlock == Blocks.WATER)) {
+        while (localBlock == Blocks.FLOWING_WATER || localBlock == Blocks.WATER) {
             i++;
             localBlock = this.c
                     .getType(new BlockPosition(MathHelper.floor(this.b.locX), i, MathHelper.floor(this.b.locZ)))
                     .getBlock();
             j++;
-            if (j > 16) {
+            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 07da55506..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
@@ -36,9 +36,8 @@ public class PlayerPathfinder {
         Object localObject = paramPathPoint1;
         while (!this.a.e()) {
             PathPoint localPathPoint1 = this.a.c();
-            if (localPathPoint1.equals(paramPathPoint2)) {
+            if (localPathPoint1.equals(paramPathPoint2))
                 return a(paramPathPoint1, paramPathPoint2);
-            }
             if (localPathPoint1.b(paramPathPoint2) < ((PathPoint) localObject).b(paramPathPoint2)) {
                 localObject = localPathPoint1;
             }
@@ -49,7 +48,7 @@ public class PlayerPathfinder {
                 try {
                     float e = E.getFloat(localObject);
                     float f = e + localPathPoint1.b(localPathPoint2);
-                    if ((f < paramFloat * 2.0F) && ((!localPathPoint2.a()) || (f < e))) {
+                    if (f < paramFloat * 2.0F && (!localPathPoint2.a() || f < e)) {
                         H.set(localPathPoint2, localPathPoint1);
                         E.set(localPathPoint2, f);
                         newF = localPathPoint2.b(paramPathPoint2);
@@ -68,9 +67,8 @@ public class PlayerPathfinder {
                 }
             }
         }
-        if (localObject == paramPathPoint1) {
+        if (localObject == paramPathPoint1)
             return null;
-        }
         return a(paramPathPoint1, (PathPoint) localObject);
     }
 
@@ -111,11 +109,11 @@ public class PlayerPathfinder {
         }
         PathPoint[] arrayOfPathPoint = new PathPoint[i];
         localPathPoint = paramPathPoint2;
-        arrayOfPathPoint[(--i)] = localPathPoint;
+        arrayOfPathPoint[--i] = localPathPoint;
         try {
             while (H.get(localPathPoint) != null) {
                 localPathPoint = (PathPoint) H.get(localPathPoint);
-                arrayOfPathPoint[(--i)] = localPathPoint;
+                arrayOfPathPoint[--i] = localPathPoint;
             }
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
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 8fb597dd2..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
@@ -9,7 +9,7 @@ import net.minecraft.server.v1_8_R3.PathfinderAbstract;
 
 public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
     protected IBlockAccess a;
-    protected IntHashMap<PathPoint> b = new IntHashMap<PathPoint>();
+    protected IntHashMap<PathPoint> b = new IntHashMap<>();
     protected int c;
     protected int d;
     protected int e;
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 9dc4ce1a0..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
@@ -34,12 +34,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     @Override
     public PathPoint a(Entity paramEntity) {
         int k;
-        if ((this.i) && (paramEntity.V())) {
+        if (this.i && paramEntity.V()) {
             k = (int) paramEntity.getBoundingBox().b;
             BlockPosition.MutableBlockPosition localMutableBlockPosition = new BlockPosition.MutableBlockPosition(
                     MathHelper.floor(paramEntity.locX), k, MathHelper.floor(paramEntity.locZ));
             Block localBlock = this.a.getType(localMutableBlockPosition).getBlock();
-            while ((localBlock == Blocks.FLOWING_WATER) || (localBlock == Blocks.WATER)) {
+            while (localBlock == Blocks.FLOWING_WATER || localBlock == Blocks.WATER) {
                 k++;
                 localMutableBlockPosition.c(MathHelper.floor(paramEntity.locX), k, MathHelper.floor(paramEntity.locZ));
                 localBlock = this.a.getType(localMutableBlockPosition).getBlock();
@@ -64,14 +64,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
     private PathPoint a(Entity paramEntity, int paramInt1, int paramInt2, int paramInt3, int paramInt4) {
         PathPoint localPathPoint = null;
         int k = a(paramEntity, paramInt1, paramInt2, paramInt3);
-        if (k == 2) {
+        if (k == 2)
             return a(paramInt1, paramInt2, paramInt3);
-        }
         if (k == 1) {
             localPathPoint = a(paramInt1, paramInt2, paramInt3);
         }
-        if ((localPathPoint == null) && (paramInt4 > 0) && (k != -3) && (k != -4)
-                && (a(paramEntity, paramInt1, paramInt2 + paramInt4, paramInt3) == 1)) {
+        if (localPathPoint == null && paramInt4 > 0 && k != -3 && k != -4
+                && a(paramEntity, paramInt1, paramInt2 + paramInt4, paramInt3) == 1) {
             localPathPoint = a(paramInt1, paramInt2 + paramInt4, paramInt3);
             paramInt2 += paramInt4;
         }
@@ -80,26 +79,22 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
             int n = 0;
             while (paramInt2 > 0) {
                 n = a(paramEntity, paramInt1, paramInt2 - 1, paramInt3);
-                if ((this.h) && (n == -1)) {
+                if (this.h && n == -1)
                     return null;
-                }
                 if (n == 1) {
-                    if (m++ >= paramEntity.aE()) {
+                    if (m++ >= paramEntity.aE())
                         return null;
-                    }
                     paramInt2--;
                     if (paramInt2 > 0) {
                         localPathPoint = a(paramInt1, paramInt2, paramInt3);
-                    } else {
+                    } else
                         return null;
-                    }
                 } else {
                     break;
                 }
             }
-            if (n == -2) {
+            if (n == -2)
                 return null;
-            }
         }
         return localPathPoint;
     }
@@ -122,17 +117,17 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
         PathPoint localPathPoint2 = a(paramEntity, paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c, m);
         PathPoint localPathPoint3 = a(paramEntity, paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c, m);
         PathPoint localPathPoint4 = a(paramEntity, paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c - 1, m);
-        if ((localPathPoint1 != null) && (!localPathPoint1.i) && (localPathPoint1.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(k++)] = localPathPoint1;
+        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 (localPathPoint2 != null && !localPathPoint2.i && localPathPoint2.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[k++] = localPathPoint2;
         }
-        if ((localPathPoint3 != null) && (!localPathPoint3.i) && (localPathPoint3.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(k++)] = localPathPoint3;
+        if (localPathPoint3 != null && !localPathPoint3.i && localPathPoint3.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[k++] = localPathPoint3;
         }
-        if ((localPathPoint4 != null) && (!localPathPoint4.i) && (localPathPoint4.a(paramPathPoint2) < paramFloat)) {
-            paramArrayOfPathPoint[(k++)] = localPathPoint4;
+        if (localPathPoint4 != null && !localPathPoint4.i && localPathPoint4.a(paramPathPoint2) < paramFloat) {
+            paramArrayOfPathPoint[k++] = localPathPoint4;
         }
         return k;
     }
@@ -173,43 +168,36 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
                     localMutableBlockPosition.c(m, n, i1);
                     Block localBlock = paramIBlockAccess.getType(localMutableBlockPosition).getBlock();
                     if (localBlock.getMaterial() != Material.AIR) {
-                        if ((localBlock == Blocks.TRAPDOOR) || (localBlock == Blocks.IRON_TRAPDOOR)) {
+                        if (localBlock == Blocks.TRAPDOOR || localBlock == Blocks.IRON_TRAPDOOR) {
                             k = 1;
-                        } else if ((localBlock == Blocks.FLOWING_WATER) || (localBlock == Blocks.WATER)) {
-                            if (paramBoolean1) {
+                        } else if (localBlock == Blocks.FLOWING_WATER || localBlock == Blocks.WATER) {
+                            if (paramBoolean1)
                                 return -1;
-                            }
                             k = 1;
-                        } else if ((!paramBoolean3) && ((localBlock instanceof BlockDoor))
-                                && (localBlock.getMaterial() == Material.WOOD)) {
+                        } 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)
-                                    .getBlock() instanceof BlockMinecartTrackAbstract))
-                                    && (!(paramEntity.world.getType(localBlockPosition.down())
-                                            .getBlock() instanceof BlockMinecartTrackAbstract))) {
+                        if (paramEntity.world.getType(localMutableBlockPosition)
+                                .getBlock() instanceof BlockMinecartTrackAbstract) {
+                            if (!(paramEntity.world.getType(localBlockPosition)
+                                    .getBlock() instanceof BlockMinecartTrackAbstract)
+                                    && !(paramEntity.world.getType(localBlockPosition.down())
+                                            .getBlock() instanceof BlockMinecartTrackAbstract))
                                 return -3;
-                            }
                         } else if (!localBlock.b(paramIBlockAccess, localMutableBlockPosition)) {
-                            if ((!paramBoolean2) || (!(localBlock instanceof BlockDoor))
-                                    || (localBlock.getMaterial() != Material.WOOD)) {
-                                if (((localBlock instanceof BlockFence)) || ((localBlock instanceof BlockFenceGate))
-                                        || ((localBlock instanceof BlockCobbleWall))) {
+                            if (!paramBoolean2 || !(localBlock instanceof BlockDoor)
+                                    || localBlock.getMaterial() != Material.WOOD) {
+                                if (localBlock instanceof BlockFence || localBlock instanceof BlockFenceGate
+                                        || localBlock instanceof BlockCobbleWall)
                                     return -3;
-                                }
-                                if ((localBlock == Blocks.TRAPDOOR) || (localBlock == Blocks.IRON_TRAPDOOR)) {
+                                if (localBlock == Blocks.TRAPDOOR || localBlock == Blocks.IRON_TRAPDOOR)
                                     return -4;
-                                }
                                 Material localMaterial = localBlock.getMaterial();
                                 if (localMaterial == Material.LAVA) {
-                                    if (!paramEntity.ab()) {
+                                    if (!paramEntity.ab())
                                         return -2;
-                                    }
-                                } else {
+                                } else
                                     return 0;
-                                }
                             }
                         }
                     }
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 f681ea7dd..0736a12f7 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
@@ -105,9 +105,8 @@ public class PlayerlistTrackerEntry extends EntityTrackerEntry {
     private static int getB(EntityTrackerEntry entry) {
         try {
             Entity entity = entry.tracker;
-            if (entity instanceof NPCHolder) {
+            if (entity instanceof NPCHolder)
                 return ((NPCHolder) entity).getNPC().data().get(NPC.Metadata.TRACKING_RANGE, (Integer) B.get(entry));
-            }
             return (Integer) B.get(entry);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();