From 87cf1c80c3d259c25bf11167e75b2c9d1fde9aed Mon Sep 17 00:00:00 2001 From: 70000hp <105080577+70000hp@users.noreply.github.com> Date: Fri, 12 Jan 2024 19:01:08 -0500 Subject: [PATCH] ouch. --- .../java/com/hbm/entity/mob/EntityGlyphidDigger.java | 10 ++++++---- .../java/com/hbm/entity/projectile/EntityRubble.java | 7 +------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/hbm/entity/mob/EntityGlyphidDigger.java b/src/main/java/com/hbm/entity/mob/EntityGlyphidDigger.java index 1f9b2d343..f0c8d6a12 100644 --- a/src/main/java/com/hbm/entity/mob/EntityGlyphidDigger.java +++ b/src/main/java/com/hbm/entity/mob/EntityGlyphidDigger.java @@ -64,7 +64,7 @@ public class EntityGlyphidDigger extends EntityGlyphid { * Mainly composed of crusty old power fist code, with some touch ups **/ public void groundSlam(){ - if (!worldObj.isRemote && entityToAttack instanceof EntityLivingBase && this.getDistanceToEntity(entityToAttack) < (useExtendedTargeting() ? 128D : 16D)) { + if (!worldObj.isRemote && entityToAttack instanceof EntityLivingBase && this.getDistanceToEntity(entityToAttack) < 30) { Entity e = this.getEntityToAttack(); boolean topAttack = false; @@ -91,7 +91,9 @@ public class EntityGlyphidDigger extends EntityGlyphid { if(this.lastTarget != e) { velX = velY = velZ = 0; - } else if (this.getDistanceToEntity(e) < 11) { + } + + if (this.getDistanceToEntity(e) > 20) { topAttack = true; } @@ -105,7 +107,7 @@ public class EntityGlyphidDigger extends EntityGlyphid { double y = delta.yCoord; double v0 = 1.2; double v02 = v0 * v0; - double g = 0.07D; + double g = 0.03D; double upperLower = topAttack ? 1 : -1; double targetPitch = Math.atan((v02 + Math.sqrt(v02*v02 - g*(g*x*x + 2*y*v02)) * upperLower) / (g*x)); Vec3 fireVec = null; @@ -126,7 +128,7 @@ public class EntityGlyphidDigger extends EntityGlyphid { Block b = worldObj.getBlock(x1, y1, z1); float k = b.getExplosionResistance(null); - if (k < 6000 && b.isNormalCube()) { + if (k < 200 && b.isNormalCube()) { EntityRubble rubble = new EntityRubble(worldObj); rubble.posX = x1 + 0.5F; diff --git a/src/main/java/com/hbm/entity/projectile/EntityRubble.java b/src/main/java/com/hbm/entity/projectile/EntityRubble.java index 5f8144cf7..05459bcfd 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRubble.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRubble.java @@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -public class EntityRubble extends EntityThrowableInterp { +public class EntityRubble extends EntityThrowableNT { public EntityRubble(World world) { @@ -50,11 +50,6 @@ public class EntityRubble extends EntityThrowableInterp { } } - @Override - public double getGravityVelocity() { - return 0.07D; - } - @Override protected float getAirDrag() { return 1F;