RepoMirrors/seppuku
1
0
Fork 1
mirror of https://github.com/seppukudevelopment/seppuku synced 2025-03-25 04:19:18 +00:00
Code Issues Releases Wiki Activity

CrystalAura: Fix attackMaxDistance

Browse Source
This commit is contained in:
noil 2021-11-06 19:56:47 -04:00
parent 0b910c4bda
commit 53d25b11cc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/rigamortis/seppuku/impl/module/combat/CrystalAuraModule.java
View File

@ -111,12 +111,14 @@ public final class CrystalAuraModule extends Module {
switch (event.getStage()) { switch (event.getStage()) {
case PRE: case PRE:
// target distance to crystal reset (attack)
if (this.currentAttackPlayer != null && this.currentAttackEntity != null) { if (this.currentAttackPlayer != null && this.currentAttackEntity != null) {
if (this.currentAttackPlayer.getDistance(this.currentAttackEntity) > this.attackMaxDistance.getValue()) { if (this.currentAttackPlayer.getDistance(this.currentAttackEntity) > this.attackMaxDistance.getValue()) {
this.currentAttackEntity = null; this.currentAttackEntity = null;
} }
} }
// target distance to crystal reset (place)
if (this.currentAttackPlayer != null && this.currentPlacePosition != null) { if (this.currentAttackPlayer != null && this.currentPlacePosition != null) {
if (this.currentAttackPlayer.getDistance(this.currentPlacePosition.getX(), this.currentPlacePosition.getY(), this.currentPlacePosition.getZ()) > this.placeMaxDistance.getValue()) { if (this.currentAttackPlayer.getDistance(this.currentPlacePosition.getX(), this.currentPlacePosition.getY(), this.currentPlacePosition.getZ()) > this.placeMaxDistance.getValue()) {
this.currentPlacePosition = null; this.currentPlacePosition = null;
@ -130,17 +132,18 @@ public final class CrystalAuraModule extends Module {
} }
} }
// crystal reset // crystal distance/death reset
if (currentAttackEntity != null) { if (currentAttackEntity != null) {
if ((mc.player.getDistance(this.currentAttackEntity) > this.attackRadius.getValue()) || !this.currentAttackEntity.isEntityAlive()) { if ((mc.player.getDistance(this.currentAttackEntity) > this.attackRadius.getValue()) || !this.currentAttackEntity.isEntityAlive()) {
this.currentAttackEntity = null; this.currentAttackEntity = null;
} }
} }
// target reset // target distance/death reset
if (currentAttackPlayer != null) { if (currentAttackPlayer != null) {
if ((mc.player.getDistance(this.currentAttackPlayer) > this.attackLocalDistance.getValue()) || !this.currentAttackPlayer.isEntityAlive()) { if ((mc.player.getDistance(this.currentAttackPlayer) > this.attackLocalDistance.getValue()) || !this.currentAttackPlayer.isEntityAlive()) {
this.currentAttackPlayer = null; this.currentAttackPlayer = null;
this.currentAttackEntity = null;
this.currentPlacePosition = null; this.currentPlacePosition = null;
} }
} }
@ -177,7 +180,7 @@ public final class CrystalAuraModule extends Module {
this.predictedCrystals.forEach((i, entityEnderCrystal) -> { this.predictedCrystals.forEach((i, entityEnderCrystal) -> {
if (mc.player.getDistance(entityEnderCrystal) <= this.attackRadius.getValue()) { if (mc.player.getDistance(entityEnderCrystal) <= this.attackRadius.getValue()) {
for (Entity ent : mc.world.loadedEntityList) { for (Entity ent : mc.world.loadedEntityList) {
if (ent != null && ent != mc.player && (ent.getDistance(entityEnderCrystal) <= this.attackMaxDistance.getValue()) && ent instanceof EntityPlayer) { if (ent != null && ent != mc.player && (ent.getDistance(mc.player) <= this.attackLocalDistance.getValue()) && (ent.getDistance(entityEnderCrystal) <= this.attackMaxDistance.getValue()) && ent instanceof EntityPlayer) {
final EntityPlayer player = (EntityPlayer) ent; final EntityPlayer player = (EntityPlayer) ent;
float currentDamage = calculateExplosionDamage(player, 6.0f, (float) entityEnderCrystal.posX, (float) entityEnderCrystal.posY, (float) entityEnderCrystal.posZ) / 2.0f; float currentDamage = calculateExplosionDamage(player, 6.0f, (float) entityEnderCrystal.posX, (float) entityEnderCrystal.posY, (float) entityEnderCrystal.posZ) / 2.0f;
float localDamage = calculateExplosionDamage(mc.player, 6.0f, (float) entityEnderCrystal.posX, (float) entityEnderCrystal.posY, (float) entityEnderCrystal.posZ) / 2.0f; float localDamage = calculateExplosionDamage(mc.player, 6.0f, (float) entityEnderCrystal.posX, (float) entityEnderCrystal.posY, (float) entityEnderCrystal.posZ) / 2.0f;
@ -206,7 +209,7 @@ public final class CrystalAuraModule extends Module {
if (entity instanceof EntityEnderCrystal) { if (entity instanceof EntityEnderCrystal) {
if (mc.player.getDistance(entity) <= this.attackRadius.getValue()) { if (mc.player.getDistance(entity) <= this.attackRadius.getValue()) {
for (Entity ent : mc.world.loadedEntityList) { for (Entity ent : mc.world.loadedEntityList) {
if (ent != null && ent != mc.player && (ent.getDistance(entity) <= this.attackMaxDistance.getValue()) && ent != entity && ent instanceof EntityPlayer) { if (ent != null && ent != mc.player && (ent.getDistance(mc.player) <= this.attackLocalDistance.getValue()) && (ent.getDistance(entity) <= this.attackMaxDistance.getValue()) && ent != entity && ent instanceof EntityPlayer) {
final EntityPlayer player = (EntityPlayer) ent; final EntityPlayer player = (EntityPlayer) ent;
float currentDamage = calculateExplosionDamage(player, 6.0f, (float) entity.posX, (float) entity.posY, (float) entity.posZ) / 2.0f; float currentDamage = calculateExplosionDamage(player, 6.0f, (float) entity.posX, (float) entity.posY, (float) entity.posZ) / 2.0f;
float localDamage = calculateExplosionDamage(mc.player, 6.0f, (float) entity.posX, (float) entity.posY, (float) entity.posZ) / 2.0f; float localDamage = calculateExplosionDamage(mc.player, 6.0f, (float) entity.posX, (float) entity.posY, (float) entity.posZ) / 2.0f;