From 53a9204974e7996650107914aa760bb45ae1ca19 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 5 Jul 2016 18:23:22 -0400 Subject: [PATCH] Fixed Robit AI --- src/main/java/mekanism/common/RobitAIFollow.java | 1 - src/main/java/mekanism/common/RobitAIPickup.java | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index 64738d22f..0832e3d2b 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -44,7 +44,6 @@ public class RobitAIFollow extends EntityAIBase thePathfinder = entityRobit.getNavigator(); minDist = min; maxDist = max; - setMutexBits(3); } @Override diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index bf4e6f25f..74085d5d9 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -42,7 +42,6 @@ public class RobitAIPickup extends EntityAIBase theWorld = entityRobit.worldObj; moveSpeed = speed; thePathfinder = entityRobit.getNavigator(); - setMutexBits(3); } @Override @@ -52,6 +51,7 @@ public class RobitAIPickup extends EntityAIBase { return false; } + if(closest != null && closest.getDistanceSqToEntity(closest) > 100 && thePathfinder.getPathToXYZ(closest.posX, closest.posY, closest.posZ) != null) { return true; @@ -81,7 +81,7 @@ public class RobitAIPickup extends EntityAIBase } } - if(closest == null) + if(closest == null || closest.isDead) { //No valid items return false; @@ -94,7 +94,7 @@ public class RobitAIPickup extends EntityAIBase @Override public boolean continueExecuting() { - return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getFollowing() && theRobit.getEnergy() > 0 && closest.worldObj.provider.dimensionId == theRobit.worldObj.provider.dimensionId; + return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getDropPickup() && theRobit.getEnergy() > 0 && closest.worldObj.provider.dimensionId == theRobit.worldObj.provider.dimensionId; } @Override @@ -115,12 +115,12 @@ public class RobitAIPickup extends EntityAIBase @Override public void updateTask() { - theRobit.getLookHelper().setLookPositionWithEntity(closest, 6.0F, theRobit.getVerticalFaceSpeed()/10); - if(!theRobit.getDropPickup()) { return; } + + theRobit.getLookHelper().setLookPositionWithEntity(closest, 6.0F, theRobit.getVerticalFaceSpeed()/10); if(--ticker <= 0) { @@ -147,7 +147,6 @@ public class RobitAIPickup extends EntityAIBase } } } - } } }