From 1a691bd719378fa241308a3480d6685e6f5cbf55 Mon Sep 17 00:00:00 2001 From: Morphan1 Date: Tue, 1 Mar 2016 20:00:54 -0500 Subject: [PATCH] Update dEntity.has_ai --- .../denizen/utilities/entity/EntityMovement.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/EntityMovement.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/EntityMovement.java index ba034fa12f..74f0effe4f 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/entity/EntityMovement.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/entity/EntityMovement.java @@ -43,7 +43,7 @@ public static void toggleAI(Entity entity, boolean hasAI) { if (!(nmsEntity instanceof EntityInsentient)) { return; } - // TODO: 1.9 nmsEntity.getDataWatcher().watch(15, (byte) (hasAI ? 0 : 1)); + ((EntityInsentient) nmsEntity).m(!hasAI); } public static boolean isAIDisabled(Entity entity) { @@ -51,8 +51,7 @@ public static boolean isAIDisabled(Entity entity) { if (!(nmsEntity instanceof EntityInsentient)) { return true; } - // TODO: 1.9 return nmsEntity.getDataWatcher().getByte(15) != 0; - return false; + return ((EntityInsentient) nmsEntity).cR(); } public static double getSpeed(Entity entity) { @@ -171,10 +170,9 @@ public void run() { callback.run(); } nmsEntity.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(oldSpeed); - // TODO: 1.9 - //if (aiDisabled) { - // toggleAI(entity, false); - //} + if (aiDisabled) { + toggleAI(entity, false); + } cancel(); } }