Fixed Killaura Projectiles not working

BleachDev · Dec 19, 2021 · 1827942 · 1827942
1 parent 293d4fa
commit 1827942
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/org/bleachhack/module/mods/Killaura.java b/src/main/java/org/bleachhack/module/mods/Killaura.java
@@ -26,7 +26,7 @@
 import org.bleachhack.util.world.EntityUtils;
 import org.bleachhack.util.world.WorldUtils;
 
-import net.minecraft.entity.projectile.FireballEntity;
+import net.minecraft.entity.projectile.AbstractFireballEntity;
 import net.minecraft.entity.projectile.ShulkerBulletEntity;
 
 import com.google.common.collect.Streams;
@@ -143,7 +143,7 @@ private List<Entity> getEntities() {
 						|| (EntityUtils.isMob(e) && getSetting(2).asToggle().state)
 						|| (EntityUtils.isAnimal(e) && getSetting(3).asToggle().state)
 						|| (e instanceof ArmorStandEntity && getSetting(4).asToggle().state)
-						|| ((e instanceof ShulkerBulletEntity || e instanceof FireballEntity) && getSetting(5).asToggle().state))
+						|| ((e instanceof ShulkerBulletEntity || e instanceof AbstractFireballEntity) && getSetting(5).asToggle().state))
 				.sorted(comparator)
 				.limit(getSetting(7).asToggle().state ? getSetting(7).asToggle().getChild(0).asSlider().getValueLong() : 1L)
 				.collect(Collectors.toList());

diff --git a/src/main/java/org/bleachhack/util/world/EntityUtils.java b/src/main/java/org/bleachhack/util/world/EntityUtils.java
@@ -20,6 +20,8 @@
 import net.minecraft.entity.passive.PassiveEntity;
 import net.minecraft.entity.passive.SnowGolemEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.projectile.AbstractFireballEntity;
+import net.minecraft.entity.projectile.ShulkerBulletEntity;
 
 public class EntityUtils {
 
@@ -46,7 +48,7 @@ public static boolean isOtherServerPlayer(Entity e) {
 	}
 
 	public static boolean isAttackable(Entity e, boolean ignoreFriends) {
-		return e instanceof LivingEntity
+		return (e instanceof LivingEntity || e instanceof ShulkerBulletEntity || e instanceof AbstractFireballEntity)
 				&& e.isAlive()
 				&& e != MinecraftClient.getInstance().player
 				&& !e.isConnectedThroughVehicle(MinecraftClient.getInstance().player)