From dade5f0837b3038f7414e9466e41217444584120 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 21 Sep 2016 07:37:48 -0400 Subject: [PATCH] Fixed the symmetry issues of the Ritual of Containment --- changelog.txt | 5 +++++ .../bloodmagic/entity/ai/EntityAIStealthRetreat.java | 3 ++- .../java/WayofTime/bloodmagic/ritual/RitualContainment.java | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index e09ea1b8..f67465ba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +------------------------------------------------------ +Version 2.1.0-64 +------------------------------------------------------ +- Fixed the symmetry issues of the Ritual of Containment + ------------------------------------------------------ Version 2.1.0-63 ------------------------------------------------------ diff --git a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java index 431e6f82..68d84d7b 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java +++ b/src/main/java/WayofTime/bloodmagic/entity/ai/EntityAIStealthRetreat.java @@ -90,9 +90,10 @@ public class EntityAIStealthRetreat extends EntityAIBase public void updateTask() { ticksLeft--; - if (ticksLeft <= 0) + if (ticksLeft <= 0 || this.entity.getAttackTarget() == null) { this.entity.attackStateMachine = 0; + return; } if (this.entity.getDistanceSqToEntity(this.entity.getAttackTarget()) < 49.0D) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index a3a4619a..3fa04ceb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -43,9 +43,9 @@ public class RitualContainment extends Ritual if (entity instanceof EntityPlayer && (((EntityPlayer) entity).capabilities.isCreativeMode || PlayerHelper.getUUIDFromPlayer((EntityPlayer) entity).toString().equals(masterRitualStone.getOwner()))) continue; - double xDif = entity.posX - masterRitualStone.getBlockPos().getX() + 0.5; - double yDif = entity.posY - masterRitualStone.getBlockPos().getY() + 3; - double zDif = entity.posZ - masterRitualStone.getBlockPos().getZ() + 0.5; + double xDif = entity.posX - (masterRitualStone.getBlockPos().getX() + 0.5); + double yDif = entity.posY - (masterRitualStone.getBlockPos().getY() + 2.5); + double zDif = entity.posZ - (masterRitualStone.getBlockPos().getZ() + 0.5); entity.motionX = -0.05 * xDif; entity.motionY = -0.05 * yDif;