From 68a4a2e1181951065274155aec8617f2b7ea434c Mon Sep 17 00:00:00 2001 From: CallMeEchoCodes Date: Sat, 6 Jul 2024 19:52:00 +1000 Subject: [PATCH] :bug: Actually fix the bug --- .../callmeecho/bombastic/main/entity/JugglingBallEntity.java | 5 +++++ .../callmeecho/bombastic/mixin/ProjectileEntityMixin.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/callmeecho/bombastic/main/entity/JugglingBallEntity.java b/src/main/java/dev/callmeecho/bombastic/main/entity/JugglingBallEntity.java index 84aba63..bd3ce2e 100644 --- a/src/main/java/dev/callmeecho/bombastic/main/entity/JugglingBallEntity.java +++ b/src/main/java/dev/callmeecho/bombastic/main/entity/JugglingBallEntity.java @@ -117,6 +117,11 @@ protected void initDataTracker(DataTracker.Builder builder) { public boolean getEnchanted() { return this.dataTracker.get(ENCHANTED); } + @Override + protected boolean canHit(Entity entity) { + return super.canHit(entity) && entity != this.getOwner() && !(entity instanceof JugglingBallEntity); + } + @Override public void tick() { HitResult hitResult = ProjectileUtil.getCollision(this, this::canHit); diff --git a/src/main/java/dev/callmeecho/bombastic/mixin/ProjectileEntityMixin.java b/src/main/java/dev/callmeecho/bombastic/mixin/ProjectileEntityMixin.java index dfff8b1..0e3db2a 100644 --- a/src/main/java/dev/callmeecho/bombastic/mixin/ProjectileEntityMixin.java +++ b/src/main/java/dev/callmeecho/bombastic/mixin/ProjectileEntityMixin.java @@ -32,7 +32,7 @@ public ProjectileEntityMixin(EntityType type, World world) { @Inject(method = "deflect", at = @At("HEAD")) private void deflect(ProjectileDeflection deflection, Entity deflector, Entity owner, boolean fromAttack, CallbackInfoReturnable cir) { - if (!this.getWorld().isClient || !this.getType().isIn(PARRIABLE_PROJECTILE) || this.getType() == deflector.getType()) return; + if (!this.getWorld().isClient || !this.getType().isIn(PARRIABLE_PROJECTILE)) return; ClientPlayerEntity player = MinecraftClient.getInstance().player; if (player == null) return;