Chams & WallHack filtering function updated

This commit is contained in:
noil 2021-02-02 19:15:54 -05:00
parent 5a9983baad
commit 36ea526f65
2 changed files with 19 additions and 46 deletions

View File

@ -132,43 +132,25 @@ public final class ChamsModule extends Module {
private boolean checkFilter(Entity entity) {
boolean ret = false;
if (entity == Minecraft.getMinecraft().player) {
ret = false;
}
final Entity riding = Minecraft.getMinecraft().player.getRidingEntity();
if (riding != null && entity == riding) {
ret = false;
}
if (this.players.getValue() && entity instanceof EntityPlayer && entity != Minecraft.getMinecraft().player) {
ret = true;
}
if (this.animals.getValue() && entity instanceof IAnimals) {
} else if (this.animals.getValue() && entity instanceof IAnimals && !(entity instanceof IMob)) {
ret = true;
} else if (this.mobs.getValue() && entity instanceof IMob) {
ret = true;
} else if (this.items.getValue() && entity instanceof EntityItem) {
ret = true;
} else if (this.crystals.getValue() && entity instanceof EntityEnderCrystal) {
ret = true;
} else if (this.vehicles.getValue() && (entity instanceof EntityBoat || entity instanceof EntityMinecart)) {
ret = true;
}
if (this.mobs.getValue() && entity instanceof IMob) {
ret = true;
if (Minecraft.getMinecraft().player.getRidingEntity() != null && entity == Minecraft.getMinecraft().player.getRidingEntity()) {
ret = false;
}
if (this.vehicles.getValue() && (entity instanceof EntityBoat || entity instanceof EntityMinecart)) {
ret = true;
}
if (this.crystals.getValue() && entity instanceof EntityEnderCrystal) {
ret = true;
}
if (this.items.getValue() && entity instanceof EntityItem) {
ret = true;
}
if (entity instanceof EntityLivingBase) {
final EntityLivingBase entityLiving = (EntityLivingBase) entity;
if (entityLiving.ticksExisted <= 0) {
ret = false;
}

View File

@ -512,30 +512,21 @@ public final class WallHackModule extends Module {
if (this.local.getValue() && (entity == Minecraft.getMinecraft().player) && (Minecraft.getMinecraft().gameSettings.thirdPersonView != 0)) {
ret = true;
}
if (this.players.getValue() && entity instanceof EntityPlayer && entity != Minecraft.getMinecraft().player) {
} else if (this.players.getValue() && entity instanceof EntityPlayer && entity != Minecraft.getMinecraft().player) {
ret = true;
}
if (this.mobs.getValue() && entity instanceof IMob) {
} else if (this.animals.getValue() && entity instanceof IAnimals && !(entity instanceof IMob)) {
ret = true;
}
if (this.animals.getValue() && entity instanceof IAnimals && !(entity instanceof IMob)) {
} else if (this.mobs.getValue() && entity instanceof IMob) {
ret = true;
}
if (this.items.getValue() && entity instanceof EntityItem) {
} else if (this.items.getValue() && entity instanceof EntityItem) {
ret = true;
}
if (this.crystals.getValue() && entity instanceof EntityEnderCrystal) {
} else if (this.crystals.getValue() && entity instanceof EntityEnderCrystal) {
ret = true;
}
if (this.vehicles.getValue() && (entity instanceof EntityBoat || entity instanceof EntityMinecart)) {
} else if (this.vehicles.getValue() && (entity instanceof EntityBoat || entity instanceof EntityMinecart)) {
ret = true;
}
if (this.armorStand.getValue() && entity instanceof EntityArmorStand) {
} else if (this.armorStand.getValue() && entity instanceof EntityArmorStand) {
ret = true;
}
if (this.pearls.getValue() && entity instanceof EntityEnderPearl) {
} else if (this.pearls.getValue() && entity instanceof EntityEnderPearl) {
ret = true;
}