🐛 Actually fix the bug

SpiritGameStudios · Jul 6, 2024 · 68a4a2e · 68a4a2e
1 parent c6ad242
commit 68a4a2e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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<Boolean> 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;