Enable new target location mapping API and disable /npc gravity when …

…navigating
CitizensDev · Nov 24, 2015 · 7a23f78 · 7a23f78
1 parent 5f63b3f
commit 7a23f78
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
@@ -163,7 +163,10 @@ public void setPath() {
         }
 
         private void setStrategy() {
-            Location location = target.getBukkitEntity().getLocation(TARGET_LOCATION);
+            Location location = parameters.entityTargetLocationMapper().apply(target.getBukkitEntity());
+            if (location == null) {
+                throw new IllegalStateException("mapper should not return null");
+            }
             strategy = npc.isFlyable() ? new FlyingAStarNavigationStrategy(npc, location, parameters)
                     : new AStarNavigationStrategy(npc, location, parameters);
         }
@@ -183,7 +186,18 @@ private NavigationFieldWrapper(NavigationAbstract navigation) {
 
         @Override
         public void setPath() {
+            Location location = parameters.entityTargetLocationMapper().apply(target.getBukkitEntity());
+            if (location == null) {
+                throw new IllegalStateException("mapper should not return null");
+            }
+            double oldX = target.locX, oldY = target.locY, oldZ = target.locZ;
+            target.locX = location.getX();
+            target.locY = location.getY();
+            target.locZ = location.getZ();
             navigation.a(target, parameters.speed());
+            target.locX = oldX;
+            target.locY = oldY;
+            target.locZ = oldZ;
         }
 
         @Override

diff --git a/src/main/java/net/citizensnpcs/npc/entity/BatController.java b/src/main/java/net/citizensnpcs/npc/entity/BatController.java
@@ -1,5 +1,12 @@
 package net.citizensnpcs.npc.entity;
 
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftBat;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.entity.Bat;
+import org.bukkit.util.Vector;
+
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.npc.CitizensNPC;
@@ -11,13 +18,6 @@
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 import net.minecraft.server.v1_8_R3.World;
 
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftBat;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
-import org.bukkit.entity.Bat;
-import org.bukkit.util.Vector;
-
 public class BatController extends MobEntityController {
     public BatController() {
         super(EntityBatNPC.class);

diff --git a/src/main/java/net/citizensnpcs/npc/entity/RabbitController.java b/src/main/java/net/citizensnpcs/npc/entity/RabbitController.java
@@ -43,8 +43,6 @@ public EntityRabbitNPC(World world, NPC npc) {
             this.npc = (CitizensNPC) npc;
             if (npc != null) {
                 NMS.clearGoals(goalSelector, targetSelector);
-                // this.g = new ControllerJump(this);
-                // this.moveController = new ControllerMove(this);
             }
         }
 

diff --git a/src/main/java/net/citizensnpcs/trait/Gravity.java b/src/main/java/net/citizensnpcs/trait/Gravity.java
@@ -27,7 +27,7 @@ public void run() {
             ((PlayerNPC) npc.getEntity()).setGravityEnabled(!enabled);
             return;
         }
-        if (!enabled)
+        if (!enabled || npc.getNavigator().isNavigating())
             return;
         Vector vector = npc.getEntity().getVelocity();
         vector.setY(Math.max(0, vector.getY()));