From eb5ca5480759c4f5ef382ac78ff50f4270e359aa Mon Sep 17 00:00:00 2001 From: fullwall Date: Fri, 9 Jun 2017 20:31:43 +0800 Subject: [PATCH] Increase y velocity for flyable NPCs --- main/src/main/java/net/citizensnpcs/commands/NPCCommands.java | 2 +- .../net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java index 63e33b3eb..28cf32c32 100644 --- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java @@ -540,7 +540,7 @@ public class NPCCommands { npc.setFlyable(flyable); flyable = npc.isFlyable(); // may not have applied, eg bats always // flyable - Messaging.sendTr(sender, flyable ? Messages.FLYABLE_SET : Messages.FLYABLE_UNSET); + Messaging.sendTr(sender, flyable ? Messages.FLYABLE_SET : Messages.FLYABLE_UNSET, npc.getName()); } @Command( diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java index a55b03dba..c3e9d14fd 100644 --- a/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java +++ b/main/src/main/java/net/citizensnpcs/npc/ai/FlyingAStarNavigationStrategy.java @@ -121,7 +121,7 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy { double motX = velocity.getX(), motY = velocity.getY(), motZ = velocity.getZ(); motX += (Math.signum(d0) * 0.5D - motX) * 0.1; - motY += (Math.signum(d1) * 0.7D - motY) * 0.1; + motY += (Math.signum(d1) - motY) * 0.1; motZ += (Math.signum(d2) * 0.5D - motZ) * 0.1; float targetYaw = (float) (Math.atan2(motZ, motX) * 180.0D / Math.PI) - 90.0F; float normalisedTargetYaw = (targetYaw - current.getYaw()) % 360; @@ -131,7 +131,6 @@ public class FlyingAStarNavigationStrategy extends AbstractPathStrategy { if (normalisedTargetYaw < -180.0F) { normalisedTargetYaw += 360.0F; } - velocity.setX(motX).setY(motY).setZ(motZ).multiply(parameters.speed()); npc.getEntity().setVelocity(velocity);