Cleanup

CitizensDev · Nov 13, 2020 · d300296 · d300296
1 parent 0c36ea0
commit d300296
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java
@@ -164,6 +164,7 @@ public boolean update() {
         motY += (Math.signum(d1) - motY) * 0.1;
         motZ += (Math.signum(d2) * 0.5D - motZ) * 0.1;
         velocity.setX(motX).setY(motY).setZ(motZ).multiply(parameters.speed());
+        npc.getEntity().setVelocity(velocity);
 
         float targetYaw = (float) (Math.atan2(motZ, motX) * 180.0D / Math.PI) - 90.0F;
         float normalisedTargetYaw = (targetYaw - current.getYaw()) % 360;
@@ -173,8 +174,6 @@ public boolean update() {
         if (normalisedTargetYaw < -180.0F) {
             normalisedTargetYaw += 360.0F;
         }
-        velocity.setX(motX).setY(motY).setZ(motZ).multiply(parameters.speed());
-        npc.getEntity().setVelocity(velocity);
 
         if (npc.getEntity().getType() != EntityType.ENDER_DRAGON) {
             NMS.setVerticalMovement(npc.getEntity(), 0.5);

diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -193,8 +193,6 @@ private void unload() {
             nameNPC.destroy();
             nameNPC = null;
         }
-        if (hologramNPCs.isEmpty())
-            return;
         for (NPC npc : hologramNPCs) {
             npc.destroy();
         }